diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-09-14 18:28:44 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-09-15 15:39:36 +1000 |
| commit | 99f514f233fb1b3dcdd19cd2cc9ca9130ea841c8 (patch) | |
| tree | bb061220c09f5619f1b2e203613e57cbab1e473a | |
| parent | 4e9f449106bb31cad87b7985837b2181c1df3558 (diff) | |
| download | samba-99f514f233fb1b3dcdd19cd2cc9ca9130ea841c8.tar.gz samba-99f514f233fb1b3dcdd19cd2cc9ca9130ea841c8.tar.bz2 samba-99f514f233fb1b3dcdd19cd2cc9ca9130ea841c8.zip | |
s4-selftest: use the full domain name in joins
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | selftest/target/Samba4.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 1754501a46..53237e0500 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -870,7 +870,7 @@ sub provision_member($$$) my $cmd = ""; $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; - $cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{DOMAIN} member"; + $cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{REALM} member"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; unless (system($cmd) == 0) { @@ -925,7 +925,7 @@ sub provision_rpc_proxy($$$) my $cmd = ""; $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; - $cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{DOMAIN} member"; + $cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{REALM} member"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; unless (system($cmd) == 0) { @@ -981,7 +981,7 @@ sub provision_vampire_dc($$$) my $cmd = ""; $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; - $cmd .= "$net vampire $ret->{CONFIGURATION} $dcvars->{DOMAIN} --realm=$dcvars->{REALM}"; + $cmd .= "$net vampire $ret->{CONFIGURATION} $dcvars->{REALM} --realm=$dcvars->{REALM}"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; unless (system($cmd) == 0) { @@ -1159,7 +1159,7 @@ sub provision_rodc($$$) my $cmd = ""; $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; - $cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{DOMAIN} RODC"; + $cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{REALM} RODC"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; $cmd .= " --server=$dcvars->{DC_SERVER}"; |