From 6bed1b2f6f3ab32b31eedffa05efb438d3e3d299 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 28 Feb 2013 22:57:45 +1100 Subject: [PATCH] selftest: Fix specification of --machinepass to actually set a unique password Because perl does not assert on dereferencing an invalid hash key we did not notice that the passwords were being set to machine, not machineloCalMemberPass. Andrew Bartlett Reviewed-by: Jeremy Allison (cherry picked from commit 166288b162e7b658b48bc908c71f635928edc5b5) --- selftest/target/Samba4.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index c8e71c8bc67..83c56a6f640 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -875,7 +875,7 @@ sub provision_member($$$) $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} member"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; - $cmd .= " --machinepass=machine$ret->{password}"; + $cmd .= " --machinepass=machine$ret->{PASSWORD}"; unless (system($cmd) == 0) { warn("Join failed\n$cmd"); @@ -943,7 +943,7 @@ sub provision_rpc_proxy($$$) $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} member"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; - $cmd .= " --machinepass=machine$ret->{password}"; + $cmd .= " --machinepass=machine$ret->{PASSWORD}"; unless (system($cmd) == 0) { warn("Join failed\n$cmd"); @@ -1030,7 +1030,7 @@ sub provision_promoted_dc($$$) $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} MEMBER --realm=$dcvars->{REALM}"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; - $cmd .= " --machinepass=machine$ret->{password}"; + $cmd .= " --machinepass=machine$ret->{PASSWORD}"; unless (system($cmd) == 0) { warn("Join failed\n$cmd"); @@ -1043,7 +1043,7 @@ sub provision_promoted_dc($$$) $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; $cmd .= "$samba_tool domain dcpromo $ret->{CONFIGURATION} $dcvars->{REALM} DC --realm=$dcvars->{REALM}"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; - $cmd .= " --machinepass=machine$ret->{password} --use-ntvfs"; + $cmd .= " --machinepass=machine$ret->{PASSWORD} --use-ntvfs"; unless (system($cmd) == 0) { warn("Join failed\n$cmd"); @@ -1104,7 +1104,7 @@ sub provision_vampire_dc($$$) $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} DC --realm=$dcvars->{REALM}"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD} --domain-critical-only"; - $cmd .= " --machinepass=machine$ret->{password} --use-ntvfs"; + $cmd .= " --machinepass=machine$ret->{PASSWORD} --use-ntvfs"; unless (system($cmd) == 0) { warn("Join failed\n$cmd"); @@ -1169,7 +1169,7 @@ sub provision_subdom_dc($$$) $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $ctx->{realm} subdomain "; $cmd .= "--parent-domain=$dcvars->{REALM} -U$dcvars->{DC_USERNAME}\@$dcvars->{REALM}\%$dcvars->{DC_PASSWORD}"; - $cmd .= " --machinepass=machine$ret->{password} --use-ntvfs"; + $cmd .= " --machinepass=machine$ret->{PASSWORD} --use-ntvfs"; unless (system($cmd) == 0) { warn("Join failed\n$cmd"); -- 2.11.4.GIT