summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/selftest/env/Samba3.pm2
-rw-r--r--source4/selftest/env/Samba4.pm2
-rwxr-xr-xsource4/selftest/selftest.pl3
3 files changed, 6 insertions, 1 deletions
diff --git a/source4/selftest/env/Samba3.pm b/source4/selftest/env/Samba3.pm
index 6401f98e44..fa7bb41444 100644
--- a/source4/selftest/env/Samba3.pm
+++ b/source4/selftest/env/Samba3.pm
@@ -278,6 +278,7 @@ sub provision($$$)
# this gets autocreated by winbindd
my $wbsockdir="$prefix_abs/winbindd";
+ my $wbsockprivdir="$lockdir/winbindd_privileged";
##
## create the test directory layout
@@ -380,6 +381,7 @@ print CONF "
$ret{PASSWORD} = $password;
$ret{PIDDIR} = $piddir;
$ret{WINBINDD_SOCKET_DIR} = $wbsockdir;
+ $ret{WINBINDD_PRIV_PIPE_DIR} = $wbsockprivdir;
return \%ret;
}
diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm
index b074252c59..a8c2490483 100644
--- a/source4/selftest/env/Samba4.pm
+++ b/source4/selftest/env/Samba4.pm
@@ -293,6 +293,7 @@ sub provision($$$$$$)
my $ncalrpcdir = "$prefix_abs/ncalrpc";
my $lockdir = "$prefix_abs/lockdir";
my $winbindd_socket_dir = "$prefix_abs/winbind_socket";
+ my $winbindd_priv_pipe_dir = "$piddir/smbd.tmp/winbind_pipe";
my $configuration = "--configfile=$conffile";
my $ldapdir = "$privatedir/ldap";
@@ -452,6 +453,7 @@ my @provision_options = ("$self->{bindir}/smbscript", "$self->{setupdir}/provisi
PASSWORD => $password,
LDAPDIR => $ldapdir,
WINBINDD_SOCKET_DIR => $winbindd_socket_dir,
+ WINBINDD_PRIV_PIPE_DIR => $winbindd_priv_pipe_dir,
NCALRPCDIR => $ncalrpcdir,
LOCKDIR => $lockdir,
CONFIGURATION => $configuration,
diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index a88e97e01e..5e3f1e0987 100755
--- a/source4/selftest/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -617,7 +617,8 @@ my @exported_envvars = (
# misc stuff
"KRB5_CONFIG",
- "WINBINDD_SOCKET_DIR"
+ "WINBINDD_SOCKET_DIR",
+ "WINBINDD_PRIV_PIPE_DIR"
);
$SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub {