summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-30 11:16:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:50 -0500
commitb8bba729ddbaa4a45aea72e8ac4b7ab802e26e44 (patch)
treeba67be2a3ee4a01480c4c341548c163e1b2dd38d
parent42cf31f3c695913b68500302ebb2dc6cd0df4464 (diff)
downloadsamba-b8bba729ddbaa4a45aea72e8ac4b7ab802e26e44.tar.gz
samba-b8bba729ddbaa4a45aea72e8ac4b7ab802e26e44.tar.bz2
samba-b8bba729ddbaa4a45aea72e8ac4b7ab802e26e44.zip
r22601: run net join with the correct socket_wrapper and krb5 configuration
metze (This used to be commit 3064d881e3dd029816d7111d579ad06766393184)
-rw-r--r--source4/selftest/Samba4.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/selftest/Samba4.pm b/source4/selftest/Samba4.pm
index d9145033e9..e0f7e54a17 100644
--- a/source4/selftest/Samba4.pm
+++ b/source4/selftest/Samba4.pm
@@ -670,7 +670,13 @@ sub provision_member($$$)
$ret or die("Unable to provision");
- system("$self->{bindir}/net join $ret->{CONFIGURATION} $dcvars->{DOMAIN} member -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}") == 0 or die("Join failed");
+ my $cmd = "";
+ $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+ $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
+ $cmd .= "$self->{bindir}/net join $ret->{CONFIGURATION} $dcvars->{DOMAIN} member";
+ $cmd .= " -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}";
+
+ system($cmd) == 0 or die("Join failed\n$cmd");
$ret->{SMBD_TEST_FIFO} = "$prefix/smbd_test.fifo";
$ret->{SMBD_TEST_LOG} = "$prefix/smbd_test.log";