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

[metze at samba.org]

Author: metze
Date: 2007-10-08 20:06:37 +0000 (Mon, 08 Oct 2007)
New Revision: 25585

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

Log:
don't start winbindd untill the build-farm faked users work with it

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


Changeset:
Modified: branches/SAMBA_4_0/source/selftest/env/Samba3.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/env/Samba3.pm	2007-10-08 20:05:46 UTC (rev 25584)
+++ branches/SAMBA_4_0/source/selftest/env/Samba3.pm	2007-10-08 20:06:37 UTC (rev 25585)
@@ -36,14 +36,14 @@
 
 	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 @@
 
 	$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,26 +173,27 @@
 	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';
+# 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";
 
-		$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...";
 	$pid = fork();