From da6add2c6e07b898f1799e9aafa502972cd86966 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 8 Oct 2007 20:06:37 +0000
Subject: r25585: don't start winbindd untill the build-farm faked users work
 with it

metze
(This used to be commit eacbe31c897e53762dc799a8bcad7cc4679441c7)
---
 source4/selftest/env/Samba3.pm | 47 +++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

(limited to 'source4/selftest')

diff --git a/source4/selftest/env/Samba3.pm b/source4/selftest/env/Samba3.pm
index 6fdcd0871c..951fbee4ec 100644
--- a/source4/selftest/env/Samba3.pm
+++ b/source4/selftest/env/Samba3.pm
@@ -36,14 +36,14 @@ sub teardown_env($$)
 
 	my $smbdpid = read_pid($envvars, "smbd");
 	my $nmbdpid = read_pid($envvars, "nmbd");
-	my $winbinddpid = read_pid($envvars, "winbindd");
+#	my $winbinddpid = read_pid($envvars, "winbindd");
 
 	$self->stop_sig_term($smbdpid);
 	$self->stop_sig_term($nmbdpid);
-	$self->stop_sig_term($winbinddpid);
+#	$self->stop_sig_term($winbinddpid);
 	$self->stop_sig_kill($smbdpid);
 	$self->stop_sig_kill($nmbdpid);
-	$self->stop_sig_kill($winbinddpid);
+#	$self->stop_sig_kill($winbinddpid);
 
 	return 0;
 }
@@ -76,7 +76,7 @@ sub getlog_env($$)
 
 	$ret .= $self->getlog_env_app($envvars, "SMBD");
 	$ret .= $self->getlog_env_app($envvars, "NMBD");
-	$ret .= $self->getlog_env_app($envvars, "WINBINDD");
+#	$ret .= $self->getlog_env_app($envvars, "WINBINDD");
 
 	return $ret;
 }
@@ -173,25 +173,26 @@ sub check_or_start($$$$) {
 	write_pid($env_vars, "nmbd", $pid);
 	print "DONE\n";
 
-	unlink($env_vars->{WINBINDD_TEST_LOG});
-	print "STARTING WINBINDD...";
-	$pid = fork();
-	if ($pid == 0) {
-		open STDOUT, ">$env_vars->{WINBINDD_TEST_LOG}";
-		open STDERR, '>&STDOUT';
-
-		$ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
-
-		my @optargs = ("-d0");
-		if (defined($ENV{WINBINDD_OPTIONS})) {
-			@optargs = split(/ /, $ENV{WINBINDD_OPTIONS});
-		}
-
-		$ENV{MAKE_TEST_BINARY} = $self->binpath("winbindd");
-		exec($self->binpath("timelimit"), $winbindd_maxtime, $self->binpath("winbindd"), "-F", "-S", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start winbindd: $!");
-	}
-	write_pid($env_vars, "winbindd", $pid);
-	print "DONE\n";
+# disable winbindd until the build-farm faked_users work with it
+#	unlink($env_vars->{WINBINDD_TEST_LOG});
+#	print "STARTING WINBINDD...";
+#	$pid = fork();
+#	if ($pid == 0) {
+#		open STDOUT, ">$env_vars->{WINBINDD_TEST_LOG}";
+#		open STDERR, '>&STDOUT';
+#
+#		$ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+#
+#		my @optargs = ("-d0");
+#		if (defined($ENV{WINBINDD_OPTIONS})) {
+#			@optargs = split(/ /, $ENV{WINBINDD_OPTIONS});
+#		}
+#
+#		$ENV{MAKE_TEST_BINARY} = $self->binpath("winbindd");
+#		exec($self->binpath("timelimit"), $winbindd_maxtime, $self->binpath("winbindd"), "-F", "-S", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start winbindd: $!");
+#	}
+#	write_pid($env_vars, "winbindd", $pid);
+#	print "DONE\n";
 
 	unlink($env_vars->{SMBD_TEST_LOG});
 	print "STARTING SMBD...";
-- 
cgit