Author: bmbouter
Date: Thu Mar 5 19:12:20 2009
New Revision: 750554
URL: http://svn.apache.org/viewvc?rev=750554&view=rev
Log:
VCL-101
Added an OS check when the $forimaging flag is set to 1. This new version
ensures the username checked for login is "Administrator" for windows only, and
will use the VCL user's username otherwise.
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm?rev=750554&r1=750553&r2=750554&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm Thu Mar 5 19:12:20
2009
@@ -417,12 +417,12 @@
notify($ERRORS{'OK'}, 0, "checkuser flag is set to 1, checking
user connection");
# Check for the normal user ID if this isn't an imaging request
# Check for "administrator" if this is an imaging request
- if ($request_forimaging) {
- notify($ERRORS{'OK'}, 0, "forimaging flag is set to 1,
checking for connection by administrator");
+ if ($request_forimaging && $image_os_name =~ /win|vmwarewin/) {
+ notify($ERRORS{'OK'}, 0, "forimaging flag is set to 1
and imageosname is $image_os_name, checking for connection by administrator");
$retval_conn = check_connection($nodename,
$computer_ip_address, $computer_type, $remote_ip, $time_limit, $image_os_name,
0, $request_id, "administrator",$image_os_type);
}
else {
- notify($ERRORS{'OK'}, 0, "forimaging flag is set to 0,
checking for connection by $user_unityid");
+ notify($ERRORS{'OK'}, 0, "forimaging flag is set to
$request_forimaging and imageosname is $image_os_name, checking for connection
by $user_unityid");
$retval_conn = check_connection($nodename,
$computer_ip_address, $computer_type, $remote_ip, $time_limit, $image_os_name,
0, $request_id, $user_unityid,$image_os_type);
}
} ## end else [ if (!$imagemeta_checkuser)
