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

metze

diff --git a/source/selftest/env/Samba3.pm b/source/selftest/env/Samba3.pm
index 6fdcd0871c381c0c5461f34c2422ea3a3153c6e7..951fbee4ec0eb672723fd649353b42466311eb96 100644 (file)
--- a/source/selftest/env/Samba3.pm
+++ b/source/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...";