r25574: Support SMBD_OPTIONS, NMBD_OPTIONS and WINBINDD_OPTIONS environment variables...

(This used to be commit 814027146d9a4d309808bda635d5bc8d34974045)

diff --git a/source4/selftest/env/Samba3.pm b/source4/selftest/env/Samba3.pm
index fa7bb4144434b564a83d6cbf000a89df1d8c85bd..6fdcd0871c381c0c5461f34c2422ea3a3153c6e7 100644 (file)
--- a/source4/selftest/env/Samba3.pm
+++ b/source4/selftest/env/Samba3.pm
@@ -162,8 +162,13 @@ sub check_or_start($$$$) {
 
                $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
 
+               my @optargs = ("-d0");
+               if (defined($ENV{NMBD_OPTIONS})) {
+                       @optargs = split(/ /, $ENV{NMBD_OPTIONS});
+               }
+
                $ENV{MAKE_TEST_BINARY} = $self->binpath("nmbd");
-               exec($self->binpath("timelimit"), $nmbd_maxtime, $self->binpath("nmbd"), "-F", "-S", "-d0", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}) or die("Unable to start nmbd: $!");
+               exec($self->binpath("timelimit"), $nmbd_maxtime, $self->binpath("nmbd"), "-F", "-S", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start nmbd: $!");
        }
        write_pid($env_vars, "nmbd", $pid);
        print "DONE\n";
@@ -177,8 +182,13 @@ sub check_or_start($$$$) {
 
                $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", "-d0", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}) or die("Unable to start 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";
@@ -193,7 +203,11 @@ sub check_or_start($$$$) {
                $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
 
                $ENV{MAKE_TEST_BINARY} = $self->binpath("smbd");
-               exec($self->binpath("timelimit"), $smbd_maxtime, $self->binpath("smbd"), "-F", "-S", "-d0" , "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}) or die("Unable to start smbd: $!");
+               my @optargs = ("-d0");
+               if (defined($ENV{SMBD_OPTIONS})) {
+                       @optargs = split(/ /, $ENV{SMBD_OPTIONS});
+               }
+               exec($self->binpath("timelimit"), $smbd_maxtime, $self->binpath("smbd"), "-F", "-S", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start smbd: $!");
        }
        write_pid($env_vars, "smbd", $pid);
        print "DONE\n";

diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm
index a8c249048362e85e52308a1eddcd34ccc2c3e3ff..944ed83d589d0437e92da13ba0dd0028cc302a79 100644 (file)
--- a/source4/selftest/env/Samba4.pm
+++ b/source4/selftest/env/Samba4.pm
@@ -104,6 +104,9 @@ sub check_or_start($$$)
                if (defined($max_time)) {
                        $optarg = "--maximum-runtime=$max_time ";
                }
+               if (defined($ENV{SMBD_OPTIONS})) {
+                       $optarg.= " $ENV{SMBD_OPTIONS}";
+               }
                my $ret = system("$valgrind $self->{bindir}/smbd $optarg $env_vars->{CONFIGURATION} -M single -i --leak-report-full");
                if ($? == -1) {
                        print "Unable to start smbd: $ret: $!\n";