Author: fapeeler
Date: Thu Mar 21 19:32:33 2013
New Revision: 1459486
URL: http://svn.apache.org/r1459486
Log:
VCL-669
Changed variable name sshPublicKeys to lower case
Modified:
vcl/trunk/managementnode/lib/VCL/DataStructure.pm
vcl/trunk/managementnode/lib/VCL/utils.pm
Modified: vcl/trunk/managementnode/lib/VCL/DataStructure.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/DataStructure.pm?rev=1459486&r1=1459485&r2=1459486&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/DataStructure.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/DataStructure.pm Thu Mar 21 19:32:33 2013
@@ -445,7 +445,8 @@ $SUBROUTINE_MAPPINGS{user_affiliation_he
$SUBROUTINE_MAPPINGS{user_affiliation_name} =
'$self->request_data->{user}{affiliation}{name}';
$SUBROUTINE_MAPPINGS{user_affiliation_sitewwwaddress} =
'$self->request_data->{user}{affiliation}{sitewwwaddress}';
$SUBROUTINE_MAPPINGS{user_imtype_name} =
'$self->request_data->{user}{IMtype}{name}';
-$SUBROUTINE_MAPPINGS{user_sshPublicKeys} =
'$self->request_data->{user}{sshPublicKeys}';
+$SUBROUTINE_MAPPINGS{user_usePublicKeys} =
'$self->request_data->{user}{usepublickeys}';
+$SUBROUTINE_MAPPINGS{user_sshPublicKeys} =
'$self->request_data->{user}{sshpublickeys}';
$SUBROUTINE_MAPPINGS{management_node_id} = '$ENV{management_node_info}{id}';
$SUBROUTINE_MAPPINGS{management_node_ipaddress} =
'$ENV{management_node_info}{IPaddress}';
Modified: vcl/trunk/managementnode/lib/VCL/utils.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=1459486&r1=1459485&r2=1459486&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/utils.pm Thu Mar 21 19:32:33 2013
@@ -7449,6 +7449,11 @@ EOF
notify($ERRORS{'DEBUG'}, 0, "user's unityid value contains
'\@': $user_login_id, changing to $corrected_unity_id");
$user_info->{unityid} = $corrected_unity_id;
}
+
+ # If usepublickeys =0 && sshpublickeys is defined, disable public keys
by setting sshpublickeys=0
+ if (!$user_info->usepublickeys && defined($user_info->sshpublickeys)) {
+ $user_info->sshpublickeys = 0;
+ }
# For test account only
if ($user_login_id =~ /vcladmin/) {
