svn commit: samba r25468 - in branches/SAMBA_4_0/source/selftest: . env

[metze at samba.org]

Author: metze
Date: 2007-10-02 15:56:33 +0000 (Tue, 02 Oct 2007)
New Revision: 25468

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25468

Log:
export WINBINDD_PRIV_PIPE_DIR

metze
Modified:
   branches/SAMBA_4_0/source/selftest/env/Samba3.pm
   branches/SAMBA_4_0/source/selftest/env/Samba4.pm
   branches/SAMBA_4_0/source/selftest/selftest.pl


Changeset:
Modified: branches/SAMBA_4_0/source/selftest/env/Samba3.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/env/Samba3.pm	2007-10-02 15:55:34 UTC (rev 25467)
+++ branches/SAMBA_4_0/source/selftest/env/Samba3.pm	2007-10-02 15:56:33 UTC (rev 25468)
@@ -278,6 +278,7 @@
 
 	# this gets autocreated by winbindd
 	my $wbsockdir="$prefix_abs/winbindd";
+	my $wbsockprivdir="$lockdir/winbindd_privileged";
 
 	## 
 	## create the test directory layout
@@ -380,6 +381,7 @@
 	$ret{PASSWORD} = $password;
 	$ret{PIDDIR} = $piddir;
 	$ret{WINBINDD_SOCKET_DIR} = $wbsockdir;
+	$ret{WINBINDD_PRIV_PIPE_DIR} = $wbsockprivdir;
 	return \%ret;
 }
 

Modified: branches/SAMBA_4_0/source/selftest/env/Samba4.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/env/Samba4.pm	2007-10-02 15:55:34 UTC (rev 25467)
+++ branches/SAMBA_4_0/source/selftest/env/Samba4.pm	2007-10-02 15:56:33 UTC (rev 25468)
@@ -293,6 +293,7 @@
 	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 @@
 		PASSWORD => $password,
 		LDAPDIR => $ldapdir,
 		WINBINDD_SOCKET_DIR => $winbindd_socket_dir,
+		WINBINDD_PRIV_PIPE_DIR => $winbindd_priv_pipe_dir,
 		NCALRPCDIR => $ncalrpcdir,
 		LOCKDIR => $lockdir,
 		CONFIGURATION => $configuration,

Modified: branches/SAMBA_4_0/source/selftest/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/selftest/selftest.pl	2007-10-02 15:55:34 UTC (rev 25467)
+++ branches/SAMBA_4_0/source/selftest/selftest.pl	2007-10-02 15:56:33 UTC (rev 25468)
@@ -617,7 +617,8 @@
 
 	# misc stuff
 	"KRB5_CONFIG",
-	"WINBINDD_SOCKET_DIR"
+	"WINBINDD_SOCKET_DIR",
+	"WINBINDD_PRIV_PIPE_DIR"
 );
 
 $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub {