Author: fapeeler
Date: Wed Jun 22 19:50:05 2011
New Revision: 1138599
URL: http://svn.apache.org/viewvc?rev=1138599&view=rev
Log:
VCL-463
correcting typos
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/OS.pm
incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/OS.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/OS.pm?rev=1138599&r1=1138598&r2=1138599&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/OS.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/OS.pm Wed Jun 22 19:50:05
2011
@@ -1728,11 +1728,14 @@ sub manage_server_access {
next if (!($userid));
if(!exists($res_accounts{$userid})){
#check affiliation
- my $affiliation_name = get_user_affiliation($userid);
- if(!(grep(/$affiliation_name/, split(/,/,
$not_standalone_list) ))) {
- $standalone = 1;
+ notify($ERRORS{'OK'}, 0, "checking affiliation for
$userid");
+ my $affiliation_name =
get_user_affiliation($user_hash{$userid}{vcl_user_id});
+ if(defined($affiliation_name)) {
+
+ if(!(grep(/$affiliation_name/, split(/,/,
$not_standalone_list) ))) {
+ $standalone = 1;
+ }
}
-
#IF standalone - generate password
if($standalone) {
$user_hash{$userid}{"passwd"} = getpw();
Modified: incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=1138599&r1=1138598&r2=1138599&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/utils.pm Wed Jun 22 19:50:05 2011
@@ -3247,7 +3247,8 @@ sub getusergroupmembers {
SELECT
user.unityid,
- user.uid
+ user.uid,
+ user.id
FROM
user,
@@ -3271,7 +3272,7 @@ sub getusergroupmembers {
for (@selected_rows) {
my %hash = %{$_};
- push(@retarray, "$hash{unityid}:$hash{uid}");
+ push(@retarray, "$hash{unityid}:$hash{uid}:$hash{id}");
}
return @retarray;
