The branch, v3-6-test has been updated via 85cbe4a Explicitly set "nmbd: socket dir" in the test environment. (cherry picked from commit 12277bb5f5e6b3cd0e9158ebda3c1746fc25bb4a) from adfacdc Move wins_lookup_open_socket_in() to remove a compile warning.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit 85cbe4af615d9b2c6edc456bcee6475fa9ee88c0 Author: Jeremy Allison <j...@samba.org> Date: Fri Jan 7 21:28:45 2011 -0800 Explicitly set "nmbd: socket dir" in the test environment. (cherry picked from commit 12277bb5f5e6b3cd0e9158ebda3c1746fc25bb4a) ----------------------------------------------------------------------- Summary of changes: selftest/selftest.pl | 1 + selftest/target/Samba3.pm | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 9759220..40fe2df 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -818,6 +818,7 @@ my @exported_envvars = ( "KRB5_CONFIG", "WINBINDD_SOCKET_DIR", "WINBINDD_PRIV_PIPE_DIR", + "NMBD_SOCKET_DIR", "LOCAL_PATH" ); diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 279fc65..c2b31e4 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; -- Samba Shared Repository