summaryrefslogtreecommitdiff
path: root/selftest/target
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-01-07 21:28:45 -0800
committerJeremy Allison <jra@samba.org>2011-01-08 07:17:22 +0100
commit04987bd84362e894631dc0c75c74f23dd8b36a34 (patch)
tree1195e63f59ebf4cce17bc5a62e578b1ebc5e9b9a /selftest/target
parent005c6370cdaab69d4228ecbf5e7369ebc61b86ae (diff)
downloadsamba-04987bd84362e894631dc0c75c74f23dd8b36a34.tar.gz
samba-04987bd84362e894631dc0c75c74f23dd8b36a34.tar.bz2
samba-04987bd84362e894631dc0c75c74f23dd8b36a34.zip
Explicitly set "nmbd: socket dir" in the test environment.
Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Sat Jan 8 07:17:22 CET 2011 on sn-devel-104
Diffstat (limited to 'selftest/target')
-rw-r--r--selftest/target/Samba3.pm8
1 files changed, 8 insertions, 0 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 279fc65c7b..c2b31e4f06 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -220,6 +220,7 @@ sub check_or_start($$$$$) {
SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
$ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+ $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
$ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
$ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
@@ -262,6 +263,7 @@ sub check_or_start($$$$$) {
SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
$ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+ $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
$ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
$ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
@@ -304,6 +306,7 @@ sub check_or_start($$$$$) {
SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
$ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+ $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
$ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
$ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
@@ -403,6 +406,9 @@ sub provision($$$$$$)
my $wbsockdir="$prefix_abs/winbindd";
my $wbsockprivdir="$lockdir/winbindd_privileged";
+ my $nmbdsockdir="$prefix_abs/nmbd";
+ push(@dirs,$nmbdsockdir);
+
##
## create the test directory layout
##
@@ -519,6 +525,7 @@ sub provision($$$$$$)
printcap name = /dev/null
winbindd:socket dir = $wbsockdir
+ nmbd:socket dir = $nmbdsockdir
idmap uid = 100000-200000
idmap gid = 100000-200000
winbind enum users = yes
@@ -652,6 +659,7 @@ domusers:X:$gid_domusers:
$ret{PIDDIR} = $piddir;
$ret{WINBINDD_SOCKET_DIR} = $wbsockdir;
$ret{WINBINDD_PRIV_PIPE_DIR} = $wbsockprivdir;
+ $ret{NMBD_SOCKET_DIR} = $nmbdsockdir;
$ret{SOCKET_WRAPPER_DEFAULT_IFACE} = $swiface;
$ret{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd;
$ret{NSS_WRAPPER_GROUP} = $nss_wrapper_group;