Changeset 745 for trunk/server/selftest

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• selftest/BuildFarm.pm (deleted)
• selftest/README (modified) (3 diffs)
• selftest/Subunit.pm (modified) (4 diffs)
• selftest/Subunit/Diff.pm (deleted)
• selftest/Subunit/Filter.pm (deleted)
• selftest/diff-subunit.pl (deleted)
• selftest/filter-subunit (copied) (copied from vendor/current/selftest/filter-subunit )
• selftest/filter-subunit.pl (deleted)
• selftest/format-subunit (copied) (copied from vendor/current/selftest/format-subunit )
• selftest/format-subunit.pl (deleted)
• selftest/gdb_backtrace (modified) (4 diffs)
• selftest/gdb_backtrace_test.c (modified) (1 diff)
• selftest/in_screen (copied) (copied from vendor/current/selftest/in_screen )
• selftest/output/html.pm (deleted)
• selftest/output/plain.pm (deleted)
• selftest/output/testresults.css (deleted)
• selftest/selftest.pl (modified) (37 diffs)
• selftest/selftesthelpers.py (copied) (copied from vendor/current/selftest/selftesthelpers.py )
• selftest/subunithelper.py (copied) (copied from vendor/current/selftest/subunithelper.py )
• selftest/target/Kvm.pm (modified) (1 diff)
• selftest/target/Samba3.pm (modified) (30 diffs)
• selftest/target/Samba4.pm (modified) (37 diffs)
• selftest/target/Template.pm (modified) (1 diff)
• selftest/test_samba4.pl (modified) (1 diff)

trunk/server/selftest/README

@@ -11 +11 @@
 selftest.pl simply outputs subunit, which can then be formatted or analyzed 
 by tools that understand the subunit protocol. One of these tools is 
-format-subunit.pl, which is used by default as part of "make test".
+format-subunit, which is used by default as part of "make test".
 
 Available testsuites
 ====================
 The available testsuites are obtained from a script, usually 
-selftest/samba{3,4}_tests.sh. This script should for each testsuite output 
+source{3,4}/selftest/tests.sh. This script should for each testsuite output 
 the name of the test, the command to run and the environment that should be 
 provided. Use the included "plantest" function to generate the required output.
@@ -38 +38 @@
 for the last announced test.
 
-Accepted commands are:
+For a full description of the subunit protocol, see ../lib/subunit/README.
 
-test
-~~~~
-test: <NAME>
-
-Announce that a new test with the specified name is starting
-
-success
-~~~~~~~
-success: <NAME> 
-
-Announce that the test with the specified name is done and ran successfully.
-
-failure
-~~~~~~~
-failure: <NAME> 
-failure: <NAME> [ REASON ]
-
-Announce that the test with the specified name failed. Optionally, it is 
-possible to specify a reason it failed.
-
-The alias "fail" will also work.
-
-xfail
-~~~~~
-xfail: <NAME>
-xfail: <NAME> [ REASON ]
-
-Announce that the test with the specified name failed but that the failure
-was expected, e.g. it's a test for a known bug that hasn't been fixed yet.
-Alternatively it is also possible to simply return "failure:" here but 
-specify in the samba4-knownfailures file that it is failing.
-
-skip
-~~~~
-skip: <NAME>
-skip: <NAME> [ REASON ]
-
-Announce that the test with the specified name was skipped. Optionally a 
-reason can be specified.
-
-time
-~~~~
-time: YYYY-MM-DD HH:mm:ssZ
-
-Announce the current time. This may be used to calculate the duration of 
-various tests.
-
-The following are Samba extensions to Subunit:
+The following commands are Samba extensions to Subunit:
 
 testsuite-count
@@ -96 +49 @@
 
 start-testsuite
-~~~~~~~~~
+~~~~~~~~~~~~~~~
 start-testsuite: name
 

trunk/server/selftest/Subunit.pm

@@ -20 +20 @@
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(parse_results);
 
 use strict;
-
-sub parse_results($$$)
-{
-        my ($msg_ops, $statistics, $fh) = @_;
-        my $expected_fail = 0;
-        my $unexpected_fail = 0;
-        my $unexpected_err = 0;
-        my $open_tests = [];
-
-        while(<$fh>) {
-                if (/^test: (.+)\n/) {
-                        $msg_ops->control_msg($_);
-                        $msg_ops->start_test($1);
-                        push (@$open_tests, $1);
-                } elsif (/^time: (\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)\n/) {
-                        $msg_ops->report_time(mktime($6, $5, $4, $3, $2-1, $1-1900));
-                } elsif (/^(success|successful|failure|fail|skip|knownfail|error|xfail|skip-testsuite|testsuite-failure|testsuite-xfail|testsuite-success|testsuite-error): (.*?)( \[)?([ \t]*)\n/) {
-                        $msg_ops->control_msg($_);
-                        my $result = $1;
-                        my $testname = $2;
-                        my $reason = undef;
-                        if ($3) {
-                                $reason = "";
-                                # reason may be specified in next lines
-                                my $terminated = 0;
-                                while(<$fh>) {
-                                        $msg_ops->control_msg($_);
-                                        if ($_ eq "]\n") { $terminated = 1; last; } else { $reason .= $_; }
-                                }
-                                
-                                unless ($terminated) {
-                                        $statistics->{TESTS_ERROR}++;
-                                        $msg_ops->end_test($testname, "error", 1, 
-                                                               "reason ($result) interrupted");
-                                        return 1;
-                                }
-                        }
-                        if ($result eq "success" or $result eq "successful") {
-                                pop(@$open_tests); #FIXME: Check that popped value == $testname 
-                                $statistics->{TESTS_EXPECTED_OK}++;
-                                $msg_ops->end_test($testname, "success", 0, $reason);
-                        } elsif ($result eq "xfail" or $result eq "knownfail") {
-                                pop(@$open_tests); #FIXME: Check that popped value == $testname
-                                $statistics->{TESTS_EXPECTED_FAIL}++;
-                                $msg_ops->end_test($testname, "xfail", 0, $reason);
-                                $expected_fail++;
-                        } elsif ($result eq "failure" or $result eq "fail") {
-                                pop(@$open_tests); #FIXME: Check that popped value == $testname
-                                $statistics->{TESTS_UNEXPECTED_FAIL}++;
-                                $msg_ops->end_test($testname, "failure", 1, $reason);
-                                $unexpected_fail++;
-                        } elsif ($result eq "skip") {
-                                $statistics->{TESTS_SKIP}++;
-                                # Allow tests to be skipped without prior announcement of test
-                                my $last = pop(@$open_tests);
-                                if (defined($last) and $last ne $testname) {
-                                        push (@$open_tests, $testname);
-                                }
-                                $msg_ops->end_test($testname, "skip", 0, $reason);
-                        } elsif ($result eq "error") {
-                                $statistics->{TESTS_ERROR}++;
-                                pop(@$open_tests); #FIXME: Check that popped value == $testname
-                                $msg_ops->end_test($testname, "error", 1, $reason);
-                                $unexpected_err++;
-                        } elsif ($result eq "skip-testsuite") {
-                                $msg_ops->skip_testsuite($testname);
-                        } elsif ($result eq "testsuite-success") {
-                                $msg_ops->end_testsuite($testname, "success", $reason);
-                        } elsif ($result eq "testsuite-failure") {
-                                $msg_ops->end_testsuite($testname, "failure", $reason);
-                        } elsif ($result eq "testsuite-xfail") {
-                                $msg_ops->end_testsuite($testname, "xfail", $reason);
-                        } elsif ($result eq "testsuite-error") {
-                                $msg_ops->end_testsuite($testname, "error", $reason);
-                        } 
-                } elsif (/^testsuite: (.*)\n/) {
-                        $msg_ops->start_testsuite($1);
-                } elsif (/^testsuite-count: (\d+)\n/) {
-                        $msg_ops->testsuite_count($1);
-                } else {
-                        $msg_ops->output_msg($_);
-                }
-        }
-
-        while ($#$open_tests+1 > 0) {
-                $msg_ops->end_test(pop(@$open_tests), "error", 1,
-                                   "was started but never finished!");
-                $statistics->{TESTS_ERROR}++;
-                $unexpected_err++;
-        }
-
-        return 1 if $unexpected_err > 0;
-        return 1 if $unexpected_fail > 0;
-        return 0;
-}
 
 sub start_test($)
@@ -132 +36 @@
         if ($reason) {
                 print "$result: $name [\n";
-                print "$reason";
+                print $reason;
+                if (substr($reason, -1, 1) ne "\n") { print "\n"; }
                 print "]\n";
         } else {
@@ -139 +44 @@
 }
 
-sub skip_test($;$)
-{
-        my $name = shift;
-        my $reason = shift;
-        end_test($name, "skip", $reason);
-}
-
-sub fail_test($;$)
-{
-        my $name = shift;
-        my $reason = shift;
-        end_test($name, "fail", $reason);
-}
-
-sub success_test($;$)
-{
-        my $name = shift;
-        my $reason = shift;
-        end_test($name, "success", $reason);
-}
-
-sub xfail_test($;$)
-{
-        my $name = shift;
-        my $reason = shift;
-        end_test($name, "xfail", $reason);
-}
-
 sub report_time($)
 {
         my ($time) = @_;
         my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime($time);
-        printf "time: %04d-%02d-%02d %02d:%02d:%02d\n", $year+1900, $mon+1, $mday, $hour, $min, $sec;
+        $sec = ($time - int($time) + $sec);
+        my $msg = sprintf("%f", $sec);
+        if (substr($msg, 1, 1) eq ".") {
+                $msg = "0" . $msg;
+        }
+        printf "time: %04d-%02d-%02d %02d:%02d:%s\n", $year+1900, $mon+1, $mday, $hour, $min, $msg;
+}
+
+sub progress_pop()
+{
+        print "progress: pop\n";
+}
+
+sub progress_push()
+{
+        print "progress: push\n";
+}
+
+sub progress($;$)
+{
+        my ($count, $whence) = @_;
+
+        unless(defined($whence)) {
+                $whence = "";
+        }
+
+        print "progress: $whence$count\n";
 }
 
@@ -206 +109 @@
 }
 
-sub testsuite_count($)
-{
-        my ($count) = @_;
-        print "testsuite-count: $count\n";
-}
-
 1;

trunk/server/selftest/gdb_backtrace

@@ -31 +31 @@
                 DB_LIST="ladebug ${DB_LIST}"
         ;;
+        #
+        # On solaris dbx is working way more better than gdb
+        # let's try it first
+        #
+        SunOS)
+                DB_LIST="dbx ${DB_LIST}"
+        ;;
+        #
+        # FreeBSD comes with a flavor that works gdb66 and one that don't gdb
+        # (gdb 6.1) let's try it first the one that works !
+        #
+        FreeBSD)
+                DB_LIST="gdb66 ${DB_LIST}"
+        ;;
 esac
 
@@ -46 +60 @@
 
 #
-# we first try to use /proc/${PID}/exe
+# we first try to use /proc/${PID}/exe or /proc/{$PID}/path for solaris
 # then fallback to the binary from the commandline
 # then we search for the commandline argument with
@@ -52 +66 @@
 #
 test -f "/proc/${PID}/exe" && BINARY="/proc/${PID}/exe"
+test -f "/proc/${PID}/path/a.out" && BINARY=`ls -l /proc/${PID}/path/a.out |sed 's/.*-> //'`
 test x"${BINARY}" = x"" && BINARY="/proc/${PID}/exe"
 test -f "${BINARY}" || BINARY=`which ${BINARY}`
@@ -76 +91 @@
         ${DB_BIN} -c "${BATCHFILE_MAIN}" -i "${BATCHFILE_PRE}" -pid "${PID}" "${BINARY}"
         ;;
-        gdb)
+        gdb66)
 cat << EOF  > ${BATCHFILE_MAIN}
 set height 1000
 bt full
+info locals
+kill
 quit
 EOF
         ${DB_BIN} -x "${BATCHFILE_MAIN}" "${BINARY}" "${PID}"
         ;;
+        gdb)
+cat << EOF  > ${BATCHFILE_MAIN}
+set height 0
+bt full
+thread apply all bt full
+info locals
+quit
+EOF
+        ${DB_BIN} -batch -x "${BATCHFILE_MAIN}" --pid "${PID}" < /dev/null
+        ;;
+dbx)
+        ${DB_BIN} "where;dump;kill;quit" "${BINARY}" "${PID}"
+        ;;
 esac
 /bin/rm -f ${BATCHFILE_PRE} ${BATCHFILE_MAIN}

trunk/server/selftest/gdb_backtrace_test.c

@@ -1 +1 @@
 /*
 
-add a usefull tool to test the gdb_backtrace script
+add a useful tool to test the gdb_backtrace script
 
 just compile it with

trunk/server/selftest/selftest.pl

@@ -1 +1 @@
 #!/usr/bin/perl
 # Bootstrap Samba and run a number of tests against it.
-# Copyright (C) 2005-2009 Jelmer Vernooij <jelmer@samba.org>
+# Copyright (C) 2005-2010 Jelmer Vernooij <jelmer@samba.org>
 # Copyright (C) 2007-2009 Stefan Metzmacher <metze@samba.org>
 
@@ -126 +126 @@
 use FindBin qw($RealBin $Script);
 use File::Spec;
+use File::Temp qw(tempfile);
 use Getopt::Long;
 use POSIX;
 use Cwd qw(abs_path);
 use lib "$RealBin";
-use Subunit qw(parse_results);
-use Subunit::Filter;
+use Subunit;
 use SocketWrapper;
+
+eval {
+require Time::HiRes;
+Time::HiRes->import("time");
+};
+if ($@) {
+        print "You don't have Time::Hires installed !\n";
+}
 
 my $opt_help = 0;
@@ -146 +154 @@
 my $opt_image = undef;
 my $opt_testenv = 0;
+my $opt_list = 0;
 my $ldap = undef;
-my $opt_analyse_cmd = undef;
 my $opt_resetup_env = undef;
 my $opt_bindir = undef;
-my $opt_no_lazy_setup = undef;
+my $opt_load_list = undef;
 my @testlists = ();
 
@@ -161 +169 @@
 my @excludes = ();
 
+sub pipe_handler {
+        my $sig = shift @_;
+        print STDERR "Exiting early because of SIGPIPE.\n";
+        exit(1);
+}
+
+$SIG{PIPE} = \&pipe_handler;
+
 sub find_in_list($$)
 {
@@ -213 +229 @@
 }
 
+# expand strings from %ENV
+sub expand_environment_strings($)
+{
+        my $s = shift;
+        # we use a reverse sort so we do the longer ones first
+        foreach my $k (sort { $b cmp $a } keys %ENV) {
+                $s =~ s/\$$k/$ENV{$k}/g;
+        }
+        return $s;
+}
+
 sub run_testsuite($$$$$)
 {
@@ -219 +246 @@
 
         Subunit::start_testsuite($name);
+        Subunit::progress_push();
         Subunit::report_time(time());
-
-        open(RESULTS, "$cmd 2>&1|");
-        my $statistics = {
-                TESTS_UNEXPECTED_OK => 0,
-                TESTS_EXPECTED_OK => 0,
-                TESTS_UNEXPECTED_FAIL => 0,
-                TESTS_EXPECTED_FAIL => 0,
-                TESTS_ERROR => 0,
-                TESTS_SKIP => 0,
-        };
-
-        my $msg_ops = new Subunit::Filter("$name\.", []);
-
-        parse_results($msg_ops, $statistics, *RESULTS);
-
-        my $ret = 0;
-
-        unless (close(RESULTS)) {
-                if ($!) {
-                        Subunit::end_testsuite($name, "error", "Unable to run $cmd: $!");
-                        return 0;
-                } else {
-                        $ret = $?;
-                }
-        } 
-
-        if ($ret & 127) {
-                Subunit::end_testsuite($name, "error", sprintf("Testsuite died with signal %d, %s coredump", ($ret & 127), ($ret & 128) ? "with": "without"));
-                return 0;
-        }
+        system($cmd);
+        Subunit::report_time(time());
+        Subunit::progress_pop();
+
+        if ($? == -1) {
+                Subunit::progress_pop();
+                Subunit::end_testsuite($name, "error", "Unable to run $cmd: $!");
+                exit(1);
+        } elsif ($? & 127) {
+                Subunit::end_testsuite($name, "error",
+                        sprintf("%s died with signal %d, %s coredump\n", $cmd, ($? & 127),  ($? & 128) ? 'with' : 'without'));
+                exit(1);
+        }
+
+        my $exitcode = $? >> 8;
+
         my $envlog = getlog_env($envname);
         if ($envlog ne "") {
@@ -256 +270 @@
 
         print "command: $cmd\n";
-
-        my $exitcode = $ret >> 8;
-
-        Subunit::report_time(time());
+        printf "expanded command: %s\n", expand_environment_strings($cmd);
+
         if ($exitcode == 0) {
                 Subunit::end_testsuite($name, "success");
@@ -315 +327 @@
  --one                      abort when the first test fails
  --verbose                  be verbose
- --analyse-cmd CMD          command to run after each test
+ --testenv                  run a shell in the requested test environment
+ --list                     list available tests
 ";
         exit(0);
@@ -336 +349 @@
                 'verbose' => \$opt_verbose,
                 'testenv' => \$opt_testenv,
+                'list' => \$opt_list,
                 'ldap:s' => \$ldap,
-                'analyse-cmd=s' => \$opt_analyse_cmd,
-                'no-lazy-setup' => \$opt_no_lazy_setup,
                 'resetup-environment' => \$opt_resetup_env,
                 'bindir:s' => \$opt_bindir,
                 'image=s' => \$opt_image,
-                'testlist=s' => \@testlists
+                'testlist=s' => \@testlists,
+                'load-list=s' => \$opt_load_list,
             );
 
@@ -348 +361 @@
 
 ShowHelp() if ($opt_help);
+
+die("--list and --testenv are mutually exclusive") if ($opt_list and $opt_testenv);
+
+# we want unbuffered output
+$| = 1;
 
 my @tests = @ARGV;
@@ -356 +374 @@
         $ENV{MALLOC_CHECK_} = 2;
 }
+
+# make all our python scripts unbuffered
+$ENV{PYTHONUNBUFFERED} = 1;
 
 my $bindir = ($opt_bindir or "$builddir/bin");
@@ -385 +406 @@
 
 my $prefix_abs = abs_path($prefix);
+my $tmpdir_abs = abs_path("$prefix/tmp");
+mkdir($tmpdir_abs, 0777) unless -d $tmpdir_abs;
+
 my $srcdir_abs = abs_path($srcdir);
 my $builddir_abs = abs_path($builddir);
@@ -398 +422 @@
 $ENV{BUILDDIR} = $builddir;
 $ENV{BUILDDIR_ABS} = $builddir_abs;
+$ENV{BINDIR} = $bindir_abs;
 $ENV{EXEEXT} = $exeext;
 
 my $tls_enabled = not $opt_quick;
 $ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no");
-$ENV{LDB_MODULES_PATH} = "$bindir_abs/modules/ldb";
-$ENV{LD_SAMBA_MODULE_PATH} = "$bindir_abs/modules";
+
 sub prefix_pathvar($$)
 {
@@ -428 +452 @@
 my $socket_wrapper_dir;
 if ($opt_socket_wrapper) {
-        $socket_wrapper_dir = SocketWrapper::setup_dir("$prefix/w", $opt_socket_wrapper_pcap);
+        $socket_wrapper_dir = SocketWrapper::setup_dir("$prefix_abs/w", $opt_socket_wrapper_pcap);
         print "SOCKET_WRAPPER_DIR=$socket_wrapper_dir\n";
 } else {
@@ -440 +464 @@
 
 if ($opt_target eq "samba4") {
-        $testenv_default = "member";
+        $testenv_default = "all";
         require target::Samba4;
-        $target = new Samba4($bindir, $ldap, "$srcdir/setup", $exeext);
+        $target = new Samba4($bindir, $ldap, $srcdir, $exeext);
 } elsif ($opt_target eq "samba3") {
         if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
@@ -449 +473 @@
         $testenv_default = "member";
         require target::Samba3;
-        $target = new Samba3($bindir);
+        $target = new Samba3($bindir, $srcdir_abs);
 } elsif ($opt_target eq "win") {
         die("Windows tests will not run with socket wrapper enabled.") 
@@ -516 +540 @@
 }
 
-my $interfaces = join(',', ("127.0.0.6/8", 
-                            "127.0.0.7/8",
-                            "127.0.0.8/8",
-                            "127.0.0.9/8",
-                            "127.0.0.10/8",
-                            "127.0.0.11/8"));
-
-my $conffile = "$prefix_abs/client/client.conf";
+my $interfaces = join(',', ("127.0.0.11/8",
+                            "127.0.0.12/8",
+                            "127.0.0.13/8",
+                            "127.0.0.14/8",
+                            "127.0.0.15/8",
+                            "127.0.0.16/8"));
+
+my $clientdir = "$prefix_abs/client";
+
+my $conffile = "$clientdir/client.conf";
 $ENV{SMB_CONF_PATH} = $conffile;
 
-sub write_clientconf($$)
-{
-        my ($conffile, $vars) = @_;
-
-        mkdir("$prefix/client", 0777) unless -d "$prefix/client";
-        
-        if ( -d "$prefix/client/private" ) {
-                unlink <$prefix/client/private/*>;
+sub write_clientconf($$$)
+{
+        my ($conffile, $clientdir, $vars) = @_;
+
+        mkdir("$clientdir", 0777) unless -d "$clientdir";
+
+        if ( -d "$clientdir/private" ) {
+                unlink <$clientdir/private/*>;
         } else {
-                mkdir("$prefix/client/private", 0777);
-        }
-
-        if ( -d "$prefix/client/lockdir" ) {
-                unlink <$prefix/client/lockdir/*>;
+                mkdir("$clientdir/private", 0777);
+        }
+
+        if ( -d "$clientdir/lockdir" ) {
+                unlink <$clientdir/lockdir/*>;
         } else {
-                mkdir("$prefix/client/lockdir", 0777);
-        }
-
-        if ( -d "$prefix_abs/client/ncalrpcdir" ) {
-                unlink <$prefix/client/ncalrpcdir/*>;
+                mkdir("$clientdir/lockdir", 0777);
+        }
+
+        if ( -d "$clientdir/ncalrpcdir" ) {
+                unlink <$clientdir/ncalrpcdir/*>;
         } else {
-                mkdir("$prefix/client/ncalrpcdir", 0777);
+                mkdir("$clientdir/ncalrpcdir", 0777);
         }
 
@@ -568 +594 @@
         }
         print CF "
-        private dir = $prefix_abs/client/private
-        lock dir = $prefix_abs/client/lockdir
-        ncalrpc dir = $prefix_abs/client/ncalrpcdir
-        name resolve order = bcast
+        private dir = $clientdir/private
+        lock dir = $clientdir/lockdir
+        ncalrpc dir = $clientdir/ncalrpcdir
+        name resolve order = bcast file
         panic action = $RealBin/gdb_backtrace \%PID\% \%PROG\%
         max xmit = 32K
@@ -578 +604 @@
         system:anonymous = true
         client lanman auth = Yes
-        torture:basedir = $prefix_abs/client
+        log level = 1
+        torture:basedir = $clientdir
 #We don't want to pass our self-tests if the PAC code is wrong
         gensec:require_pac = true
-        modules dir = $ENV{LD_SAMBA_MODULE_PATH}
+        resolv:host file = $prefix_abs/dns_host_file
+#We don't want to run 'speed' tests for very long
+        torture:timelimit = 1
 ";
         close(CF);
@@ -587 +616 @@
 
 my @todo = ();
-
-my $testsdir = "$srcdir/selftest";
-
-my %required_envs = ();
 
 sub should_run_test($)
@@ -614 +639 @@
 
         while (<IN>) {
-                if ($_ eq "-- TEST --\n") {
+                if (/-- TEST(-LOADLIST|-IDLIST|) --\n/) {
+                        my $supports_loadlist = (defined($1) and $1 eq "-LOADLIST");
+                        my $supports_idlist = (defined($1) and $1 eq "-IDLIST");
                         my $name = <IN>;
                         $name =~ s/\n//g;
@@ -622 +649 @@
                         $cmdline =~ s/\n//g;
                         if (should_run_test($name) == 1) {
-                                $required_envs{$env} = 1;
-                                push (@ret, [$name, $env, $cmdline]);
+                                push (@ret, [$name, $env, $cmdline, $supports_loadlist, $supports_idlist]);
                         }
                 } else {
@@ -638 +664 @@
 
 $ENV{SELFTEST_PREFIX} = "$prefix_abs";
+$ENV{SELFTEST_TMPDIR} = "$tmpdir_abs";
+$ENV{TEST_DATA_PREFIX} = "$tmpdir_abs";
 if ($opt_socket_wrapper) {
         $ENV{SELFTEST_INTERFACES} = $interfaces;
@@ -665 +693 @@
 }
 
-Subunit::testsuite_count($#available+1);
-Subunit::report_time(time());
-
-foreach (@available) {
-        my $name = $$_[0];
+my $restricted = undef;
+my $restricted_used = {};
+
+if ($opt_load_list) {
+        $restricted = [];
+        open(LOAD_LIST, "<$opt_load_list") or die("Unable to open $opt_load_list");
+        while (<LOAD_LIST>) {
+                chomp;
+                push (@$restricted, $_);
+        }
+        close(LOAD_LIST);
+}
+
+my $individual_tests = undef;
+$individual_tests = {};
+
+foreach my $testsuite (@available) {
+        my $name = $$testsuite[0];
         my $skipreason = skip($name);
-        if (defined($skipreason)) {
+        if (defined($restricted)) {
+                # Find the testsuite for this test
+                my $match = undef;
+                foreach my $r (@$restricted) {
+                        if ($r eq $name) {
+                                $individual_tests->{$name} = [];
+                                $match = $r;
+                                $restricted_used->{$r} = 1;
+                        } elsif (substr($r, 0, length($name)+1) eq "$name.") {
+                                push(@{$individual_tests->{$name}}, $r);
+                                $match = $r;
+                                $restricted_used->{$r} = 1;
+                        }
+                }
+                if ($match) {
+                        if (defined($skipreason)) {
+                                        Subunit::skip_testsuite($name, $skipreason);
+                        } else {
+                                push(@todo, $testsuite);
+                        }
+                }
+        } elsif (defined($skipreason)) {
                 Subunit::skip_testsuite($name, $skipreason);
         } else {
-                push(@todo, $_); 
-        }
-}
-
-if ($#todo == -1) {
+                push(@todo, $testsuite);
+        }
+}
+
+if (defined($restricted)) {
+        foreach (@$restricted) {
+                unless (defined($restricted_used->{$_})) {
+                        print "No test or testsuite found matching $_\n";
+                }
+        }
+} elsif ($#todo == -1) {
         print STDERR "No tests to run\n";
         exit(1);
-        }
+}
 
 my $suitestotal = $#todo + 1;
+
+Subunit::progress($suitestotal);
+Subunit::report_time(time());
+
 my $i = 0;
 $| = 1;
@@ -711 +783 @@
         "DC_NETBIOSALIAS",
 
+        # domain member
+        "MEMBER_SERVER",
+        "MEMBER_SERVER_IP",
+        "MEMBER_NETBIOSNAME",
+        "MEMBER_NETBIOSALIAS",
+
+        # rpc proxy controller stuff
+        "RPC_PROXY_SERVER",
+        "RPC_PROXY_SERVER_IP",
+        "RPC_PROXY_NETBIOSNAME",
+        "RPC_PROXY_NETBIOSALIAS",
+
+        # domain controller stuff for Vampired DC
+        "VAMPIRE_DC_SERVER",
+        "VAMPIRE_DC_SERVER_IP",
+        "VAMPIRE_DC_NETBIOSNAME",
+        "VAMPIRE_DC_NETBIOSALIAS",
+
         # server stuff
         "SERVER",
@@ -719 +809 @@
         # user stuff
         "USERNAME",
+        "USERID",
         "PASSWORD",
         "DC_USERNAME",
@@ -726 +817 @@
         "KRB5_CONFIG",
         "WINBINDD_SOCKET_DIR",
-        "WINBINDD_PRIV_PIPE_DIR"
+        "WINBINDD_PRIV_PIPE_DIR",
+        "NMBD_SOCKET_DIR",
+        "LOCAL_PATH"
 );
 
@@ -735 +828 @@
 };
 
-sub setup_env($)
-{
-        my ($name) = @_;
+sub setup_env($$)
+{
+        my ($name, $prefix) = @_;
 
         my $testenv_vars = undef;
@@ -754 +847 @@
         } elsif (defined(get_running_env($envname))) {
                 $testenv_vars = get_running_env($envname);
-                if (not $target->check_env($testenv_vars)) {
+                if (not $testenv_vars->{target}->check_env($testenv_vars)) {
+                        print $testenv_vars->{target}->getlog_env($testenv_vars);
                         $testenv_vars = undef;
                 }
         } else {
                 $testenv_vars = $target->setup_env($envname, $prefix);
+                if (defined($testenv_vars) && not defined($testenv_vars->{target})) {
+                       $testenv_vars->{target} = $target;
+                }
         }
 
@@ -769 +866 @@
                 $ENV{SMB_CONF_PATH} = $testenv_vars->{SERVERCONFFILE};
         } elsif ($option eq "client") {
-                SocketWrapper::set_default_iface(6);
-                write_clientconf($conffile, $testenv_vars);
+                SocketWrapper::set_default_iface(11);
+                write_clientconf($conffile, $clientdir, $testenv_vars);
                 $ENV{SMB_CONF_PATH} = $conffile;
         } else {
@@ -804 +901 @@
         my ($envname) = @_;
         return "" if ($envname eq "none");
-        return $target->getlog_env(get_running_env($envname));
+        my $env = get_running_env($envname);
+        return $env->{target}->getlog_env($env);
 }
 
@@ -811 +909 @@
         my ($envname) = @_;
         return 1 if ($envname eq "none");
-        return $target->check_env(get_running_env($envname));
+        my $env = get_running_env($envname);
+        return $env->{target}->check_env($env);
 }
 
@@ -818 +917 @@
         my ($envname) = @_;
         return if ($envname eq "none");
-        $target->teardown_env(get_running_env($envname));
+        my $env = get_running_env($envname);
+        $env->{target}->teardown_env($env);
         delete $running_envs{$envname};
 }
 
-if ($opt_no_lazy_setup) {
-        setup_env($_) foreach (keys %required_envs);
-}
+# This 'global' file needs to be empty when we start
+unlink("$prefix_abs/dns_host_file");
 
 if ($opt_testenv) {
@@ -830 +929 @@
         $testenv_name = $testenv_default unless defined($testenv_name);
 
-        my $testenv_vars = setup_env($testenv_name);
+        my $testenv_vars = setup_env($testenv_name, $prefix);
+
+        die("Unable to setup environment $testenv_name") unless ($testenv_vars);
 
         $ENV{PIDDIR} = $testenv_vars->{PIDDIR};
+        $ENV{ENVNAME} = $testenv_name;
 
         my $envvarstr = exported_envvars_str($testenv_vars);
 
-        my $term = ($ENV{TERM} or "xterm");
-        system("$term -e 'echo -e \"
+        my $term = ($ENV{TERMINAL} or "xterm -e");
+        system("$term 'echo -e \"
 Welcome to the Samba4 Test environment '$testenv_name'
 
@@ -850 +952 @@
 \" && LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} bash'");
         teardown_env($testenv_name);
+} elsif ($opt_list) {
+        foreach (@todo) {
+                my $cmd = $$_[2];
+                my $name = $$_[0];
+                my $envname = $$_[1];
+
+                unless($cmd =~ /\$LISTOPT/) {
+                        warn("Unable to list tests in $name");
+                        next;
+                }
+
+                $cmd =~ s/\$LISTOPT/--list/g;
+
+                system($cmd);
+
+                if ($? == -1) {
+                        die("Unable to run $cmd: $!");
+                } elsif ($? & 127) {
+                        die(snprintf("%s died with signal %d, %s coredump\n", $cmd, ($? & 127),  ($? & 128) ? 'with' : 'without'));
+                }
+
+                my $exitcode = $? >> 8;
+                if ($exitcode != 0) {
+                        die("$cmd exited with exit code $exitcode");
+                }
+        }
 } else {
         foreach (@todo) {
                 $i++;
                 my $cmd = $$_[2];
-                $cmd =~ s/([\(\)])/\\$1/g;
                 my $name = $$_[0];
                 my $envname = $$_[1];
-                
-                my $envvars = setup_env($envname);
+
+                my $envvars = setup_env($envname, $prefix);
                 if (not defined($envvars)) {
-                        Subunit::skip_testsuite($name, 
-                                "unable to set up environment $envname");
+                        Subunit::start_testsuite($name);
+                        Subunit::end_testsuite($name, "error",
+                                "unable to set up environment $envname - exiting");
                         next;
                 }
 
+                # Generate a file with the individual tests to run, if the 
+                # test runner for this test suite supports it.
+                if ($individual_tests and $individual_tests->{$name}) {
+                        if ($$_[3]) {
+                                my ($fh, $listid_file) = tempfile(UNLINK => 0);
+                                foreach my $test (@{$individual_tests->{$name}}) {
+                                        print $fh substr($test, length($name)+1) . "\n";
+                                }
+                                $cmd =~ s/\$LOADLIST/--load-list=$listid_file/g;
+                        } elsif ($$_[4]) {
+                                $cmd =~ s/\s+[^\s]+\s*$//;
+                                $cmd .= " " . join(' ', @{$individual_tests->{$name}});
+                        }
+                }
+
                 run_testsuite($envname, $name, $cmd, $i, $suitestotal);
 
-                if (defined($opt_analyse_cmd)) {
-                        system("$opt_analyse_cmd \"$name\"");
-                }
-
                 teardown_env($envname) if ($opt_resetup_env);
         }
@@ -878 +1017 @@
 
 teardown_env($_) foreach (keys %running_envs);
-
-$target->stop();
 
 my $failed = 0;
@@ -886 +1023 @@
 foreach (<$prefix/valgrind.log*>) {
         next unless (-s $_);
-        system("grep DWARF2.CFI.reader $_ > /dev/null");
-        if ($? >> 8 == 0) {
-            print "VALGRIND FAILURE\n";
-            $failed++;
-            system("cat $_");
-        }
+        print "VALGRIND FAILURE\n";
+        $failed++;
+        system("cat $_");
 }
 exit 0;

trunk/server/selftest/target/Kvm.pm

@@ -160 +160 @@
 }
 
-sub stop($)
-{
-        my ($self) = @_;
-}
-
 1;

trunk/server/selftest/target/Samba3.pm

@@ -25 +25 @@
 
 sub new($$) {
-        my ($classname, $bindir) = @_;
-        my $self = { bindir => $bindir };
+        my ($classname, $bindir, $srcdir) = @_;
+        my $self = { bindir => $bindir,
+                     srcdir => $srcdir
+        };
         bless $self;
         return $self;
@@ -97 +99 @@
         my ($self, $envname, $path) = @_;
         
-        if ($envname eq "dc") {
-                return $self->setup_dc("$path/dc");
+        if ($envname eq "s3dc") {
+                return $self->setup_dc("$path/s3dc");
+        } elsif ($envname eq "secshare") {
+                return $self->setup_secshare("$path/secshare");
+        } elsif ($envname eq "secserver") {
+                if (not defined($self->{vars}->{s3dc})) {
+                        $self->setup_dc("$path/s3dc");
+                }
+                return $self->setup_secserver("$path/secserver", $self->{vars}->{s3dc});
         } elsif ($envname eq "member") {
-                if (not defined($self->{vars}->{dc})) {
-                        $self->setup_dc("$path/dc");
-                }
-                return $self->setup_member("$path/member", $self->{vars}->{dc});
+                if (not defined($self->{vars}->{s3dc})) {
+                        $self->setup_dc("$path/s3dc");
+                }
+                return $self->setup_member("$path/member", $self->{vars}->{s3dc});
         } else {
                 return undef;
@@ -113 +122 @@
         my ($self, $path) = @_;
 
-        print "PROVISIONING DC...";
-
-        my $dc_options = "
+        print "PROVISIONING S3DC...";
+
+        my $s3dc_options = "
         domain master = yes
         domain logons = yes
@@ -122 +131 @@
 
         my $vars = $self->provision($path,
-                                    "LOCALDC2",
+                                    "LOCALS3DC2",
                                     2,
-                                    "localdc2pass",
-                                    $dc_options);
+                                    "locals3dc2pass",
+                                    $s3dc_options);
 
         $self->check_or_start($vars,
@@ -133 +142 @@
         $self->wait_for_start($vars);
 
-        $self->{vars}->{dc} = $vars;
+        $vars->{DC_SERVER} = $vars->{SERVER};
+        $vars->{DC_SERVER_IP} = $vars->{SERVER_IP};
+        $vars->{DC_NETBIOSNAME} = $vars->{NETBIOSNAME};
+        $vars->{DC_USERNAME} = $vars->{USERNAME};
+        $vars->{DC_PASSWORD} = $vars->{PASSWORD};
+
+        $self->{vars}->{s3dc} = $vars;
 
         return $vars;
@@ -140 +155 @@
 sub setup_member($$$)
 {
-        my ($self, $prefix, $dcvars) = @_;
+        my ($self, $prefix, $s3dcvars) = @_;
 
         print "PROVISIONING MEMBER...";
@@ -159 +174 @@
         my $cmd = "";
         $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
-        $cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{DOMAIN} member";
-        $cmd .= " -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}";
+        $cmd .= "$net join $ret->{CONFIGURATION} $s3dcvars->{DOMAIN} member";
+        $cmd .= " -U$s3dcvars->{USERNAME}\%$s3dcvars->{PASSWORD}";
 
         system($cmd) == 0 or die("Join failed\n$cmd");
@@ -170 +185 @@
         $self->wait_for_start($ret);
 
-        $ret->{DC_SERVER} = $dcvars->{SERVER};
-        $ret->{DC_SERVER_IP} = $dcvars->{SERVER_IP};
-        $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
-        $ret->{DC_USERNAME} = $dcvars->{USERNAME};
-        $ret->{DC_PASSWORD} = $dcvars->{PASSWORD};
+        $ret->{DC_SERVER} = $s3dcvars->{SERVER};
+        $ret->{DC_SERVER_IP} = $s3dcvars->{SERVER_IP};
+        $ret->{DC_NETBIOSNAME} = $s3dcvars->{NETBIOSNAME};
+        $ret->{DC_USERNAME} = $s3dcvars->{USERNAME};
+        $ret->{DC_PASSWORD} = $s3dcvars->{PASSWORD};
 
         return $ret;
 }
 
-sub stop($)
-{
-        my ($self) = @_;
+sub setup_secshare($$)
+{
+        my ($self, $path) = @_;
+
+        print "PROVISIONING server with security=share...";
+
+        my $secshare_options = "
+        security = share
+        lanman auth = yes
+";
+
+        my $vars = $self->provision($path,
+                                    "LOCALSHARE4",
+                                    4,
+                                    "local4pass",
+                                    $secshare_options);
+
+        $self->check_or_start($vars,
+                              ($ENV{SMBD_MAXTIME} or 2700),
+                               "yes", "no", "yes");
+
+        $self->wait_for_start($vars);
+
+        $self->{vars}->{secshare} = $vars;
+
+        return $vars;
+}
+
+sub setup_secserver($$$)
+{
+        my ($self, $prefix, $s3dcvars) = @_;
+
+        print "PROVISIONING server with security=server...";
+
+        my $secserver_options = "
+        security = server
+        password server = $s3dcvars->{SERVER_IP}
+";
+
+        my $ret = $self->provision($prefix,
+                                   "LOCALSERVER5",
+                                   5,
+                                   "localserver5pass",
+                                   $secserver_options);
+
+        $ret or die("Unable to provision");
+
+        $self->check_or_start($ret,
+                              ($ENV{SMBD_MAXTIME} or 2700),
+                               "yes", "no", "yes");
+
+        $self->wait_for_start($ret);
+
+        $ret->{DC_SERVER} = $s3dcvars->{SERVER};
+        $ret->{DC_SERVER_IP} = $s3dcvars->{SERVER_IP};
+        $ret->{DC_NETBIOSNAME} = $s3dcvars->{NETBIOSNAME};
+        $ret->{DC_USERNAME} = $s3dcvars->{USERNAME};
+        $ret->{DC_PASSWORD} = $s3dcvars->{PASSWORD};
+
+        return $ret;
 }
 
@@ -226 +298 @@
 
                 $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+                $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
 
                 $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
@@ -253 +326 @@
                 }
 
-                exec(@preargs, $self->binpath("nmbd"), "-F", "-S", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start nmbd: $!");
+                exec(@preargs, $self->binpath("nmbd"), "-F", "--no-process-group", "-S", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start nmbd: $!");
         }
         write_pid($env_vars, "nmbd", $pid);
@@ -268 +341 @@
 
                 $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+                $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
 
                 $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
@@ -295 +369 @@
                 }
 
-                exec(@preargs, $self->binpath("winbindd"), "-F", "-S", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start winbindd: $!");
+                exec(@preargs, $self->binpath("winbindd"), "-F", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start winbindd: $!");
         }
         write_pid($env_vars, "winbindd", $pid);
@@ -310 +384 @@
 
                 $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+                $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
 
                 $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
@@ -334 +409 @@
                         @preargs = split(/ /,$ENV{SMBD_VALGRIND});
                 }
-                exec(@preargs, $self->binpath("smbd"), "-F", "-S", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start smbd: $!");
+                exec(@preargs, $self->binpath("smbd"), "-F", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start smbd: $!");
         }
         write_pid($env_vars, "smbd", $pid);
@@ -340 +415 @@
 
         return 0;
-}
-
-sub create_clientconf($$$)
-{
-        my ($self, $prefix, $domain) = @_;
-
-        my $lockdir = "$prefix/locks";
-        my $logdir = "$prefix/logs";
-        my $piddir = "$prefix/pid";
-        my $privatedir = "$prefix/private";
-        my $conffile = "$prefix/smb.conf";
-
-        my $torture_interfaces='127.0.0.6/8,127.0.0.7/8,127.0.0.8/8,127.0.0.9/8,127.0.0.10/8,127.0.0.11/8';
-        open(CONF, ">$conffile");
-        print CONF "
-[global]
-        workgroup = $domain
-
-        private dir = $privatedir
-        pid directory = $piddir
-        lock directory = $lockdir
-        log file = $logdir/log.\%m
-        log level = 0
-
-        name resolve order = bcast
-
-        netbios name = TORTURE_6
-        interfaces = $torture_interfaces
-        panic action = $RealBin/gdb_backtrace \%d %\$(MAKE_TEST_BINARY)
-
-        passdb backend = tdbsam
-        ";
-        close(CONF);
 }
 
@@ -395 +437 @@
         my $prefix_abs = abs_path($prefix);
         my $bindir_abs = abs_path($self->{bindir});
+        my $vfs_modulesdir_abs = ($ENV{VFSLIBDIR} or $bindir_abs);
 
         my @dirs = ();
@@ -413 +456 @@
         push(@dirs,$lockdir);
 
+        my $eventlogdir="$prefix_abs/lockdir/eventlog";
+        push(@dirs,$eventlogdir);
+
         my $logdir="$prefix_abs/logs";
         push(@dirs,$logdir);
+
+        my $driver32dir="$shrdir/W32X86";
+        push(@dirs,$driver32dir);
+
+        my $driver64dir="$shrdir/x64";
+        push(@dirs,$driver64dir);
+
+        my $driver40dir="$shrdir/WIN40";
+        push(@dirs,$driver40dir);
+
+        my $ro_shrdir="$shrdir/root-tmp";
+        push(@dirs,$ro_shrdir);
+
+        my $msdfs_shrdir="$shrdir/msdfsshare";
+        push(@dirs,$msdfs_shrdir);
+
+        my $msdfs_deeppath="$msdfs_shrdir/deeppath";
+        push(@dirs,$msdfs_deeppath);
 
         # this gets autocreated by winbindd
         my $wbsockdir="$prefix_abs/winbindd";
         my $wbsockprivdir="$lockdir/winbindd_privileged";
+
+        my $nmbdsockdir="$prefix_abs/nmbd";
+        unlink($nmbdsockdir);
 
         ## 
@@ -431 +498 @@
         mkdir($_, 0777) foreach(@dirs);
 
+        ##
+        ## create ro and msdfs share layout
+        ##
+
+        chmod 0755, $ro_shrdir;
+        my $unreadable_file = "$ro_shrdir/unreadable_file";
+        open(UNREADABLE_FILE, ">$unreadable_file") or die("Unable to open $unreadable_file");
+        close(UNREADABLE_FILE);
+        chmod 0600, $unreadable_file;
+
+        my $msdfs_target = "$ro_shrdir/msdfs-target";
+        open(MSDFS_TARGET, ">$msdfs_target") or die("Unable to open $msdfs_target");
+        close(MSDFS_TARGET);
+        chmod 0666, $msdfs_target;
+        symlink "msdfs:$server_ip\\ro-tmp", "$msdfs_shrdir/msdfs-src1";
+        symlink "msdfs:$server_ip\\ro-tmp", "$msdfs_shrdir/deeppath/msdfs-src2";
+
         my $conffile="$libdir/server.conf";
 
-        my $nss_wrapper_pl = "$ENV{PERL} $RealBin/../lib/nss_wrapper/nss_wrapper.pl";
+        my $nss_wrapper_pl = "$ENV{PERL} $self->{srcdir}/lib/nss_wrapper/nss_wrapper.pl";
         my $nss_wrapper_passwd = "$privatedir/passwd";
         my $nss_wrapper_group = "$privatedir/group";
+
+        my $mod_printer_pl = "$ENV{PERL} $self->{srcdir}/source3/script/tests/printing/modprinter.pl";
+
+        my @eventlog_list = ("dns server", "application");
+
+        ##
+        ## calculate uids and gids
+        ##
+
+        my ($max_uid, $max_gid);
+        my ($uid_nobody, $uid_root);
+        my ($gid_nobody, $gid_nogroup, $gid_root, $gid_domusers);
+
+        if ($unix_uid < 0xffff - 2) {
+                $max_uid = 0xffff;
+        } else {
+                $max_uid = $unix_uid;
+        }
+
+        $uid_root = $max_uid - 1;
+        $uid_nobody = $max_uid - 2;
+
+        if ($unix_gids[0] < 0xffff - 3) {
+                $max_gid = 0xffff;
+        } else {
+                $max_gid = $unix_gids[0];
+        }
+
+        $gid_nobody = $max_gid - 1;
+        $gid_nogroup = $max_gid - 2;
+        $gid_root = $max_gid - 3;
+        $gid_domusers = $max_gid - 4;
+
+        ##
+        ## create conffile
+        ##
 
         open(CONF, ">$conffile") or die("Unable to open $conffile");
@@ -443 +563 @@
         interfaces = $server_ip/8
         bind interfaces only = yes
-        panic action = $RealBin/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
+        panic action = $self->{srcdir}/selftest/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
 
         workgroup = $domain
@@ -452 +572 @@
         log file = $logdir/log.\%m
         log level = 0
+        debug pid = yes
 
         name resolve order = bcast
@@ -462 +583 @@
         time server = yes
 
-        add user script =               $nss_wrapper_pl --passwd_path $nss_wrapper_passwd --type passwd --action add --name %u
+        add user script =               $nss_wrapper_pl --passwd_path $nss_wrapper_passwd --type passwd --action add --name %u --gid $gid_nogroup
         add group script =              $nss_wrapper_pl --group_path  $nss_wrapper_group  --type group  --action add --name %g
-        add machine script =            $nss_wrapper_pl --passwd_path $nss_wrapper_passwd --type passwd --action add --name %u
+        add machine script =            $nss_wrapper_pl --passwd_path $nss_wrapper_passwd --type passwd --action add --name %u --gid $gid_nogroup
         add user to group script =      $nss_wrapper_pl --passwd_path $nss_wrapper_passwd --type member --action add --member %u --name %g --group_path $nss_wrapper_group
         delete user script =            $nss_wrapper_pl --passwd_path $nss_wrapper_passwd --type passwd --action delete --name %u
@@ -470 +591 @@
         delete user from group script = $nss_wrapper_pl --passwd_path $nss_wrapper_passwd --type member --action delete --member %u --name %g --group_path $nss_wrapper_group
 
+        addprinter command =            $mod_printer_pl -a -s $conffile --
+        deleteprinter command =         $mod_printer_pl -d -s $conffile --
+
+        eventlog list = application \"dns server\"
+
         kernel oplocks = no
         kernel change notify = no
@@ -478 +604 @@
 
         winbindd:socket dir = $wbsockdir
-        idmap uid = 100000-200000
-        idmap gid = 100000-200000
+        nmbd:socket dir = $nmbdsockdir
+        idmap config * : range = 100000-200000
+        winbind enum users = yes
+        winbind enum groups = yes
 
 #       min receivefile size = 4000
 
+        max protocol = SMB2
         read only = no
+        server signing = auto
+
         smbd:sharedelay = 100000
-        smbd:writetimeupdatedelay = 500000
-        map hidden = yes
-        map system = yes
+#       smbd:writetimeupdatedelay = 500000
+        map hidden = no
+        map system = no
+        map readonly = no
+        store dos attributes = yes
         create mask = 755
-        vfs objects = $bindir_abs/xattr_tdb.so $bindir_abs/streams_depot.so
-
-        # Begin extra options
-        $extra_options
-        # End extra options
-
-        #Include user defined custom parameters if set
-";
-
-        if (defined($ENV{INCLUDE_CUSTOM_CONF})) {
-                print CONF "\t$ENV{INCLUDE_CUSTOM_CONF}\n";
-        }
-
-        print CONF "
-[tmp]
-        path = $shrdir
-[hideunread]
-        copy = tmp
-        hide unreadable = yes
-[hideunwrite]
-        copy = tmp
-        hide unwriteable files = yes
-[print1]
-        copy = tmp
-        printable = yes
+        vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
+
         printing = vlp
         print command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb print %p %s
@@ -522 +632 @@
         queue pause command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb queuepause %p
         queue resume command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb queueresume %p
+        lpq cache time = 0
+
+        ncalrpc dir = $lockdir/ncalrpc
+        rpc_server:epmapper = embedded
+
+        # Begin extra options
+        $extra_options
+        # End extra options
+
+        #Include user defined custom parameters if set
+";
+
+        if (defined($ENV{INCLUDE_CUSTOM_CONF})) {
+                print CONF "\t$ENV{INCLUDE_CUSTOM_CONF}\n";
+        }
+
+        print CONF "
+[tmp]
+        path = $shrdir
+[tmpguest]
+        path = $shrdir
+        guest ok = yes
+[guestonly]
+        path = $shrdir
+        guest only = yes
+        guest ok = yes
+[forceuser]
+        path = $shrdir
+        force user = $unix_name
+        guest ok = yes
+[forcegroup]
+        path = $shrdir
+        force group = nogroup
+        guest ok = yes
+[ro-tmp]
+        path = $ro_shrdir
+        guest ok = yes
+[msdfs-share]
+        path = $msdfs_shrdir
+        msdfs root = yes
+        guest ok = yes
+[hideunread]
+        copy = tmp
+        hide unreadable = yes
+[tmpcase]
+        copy = tmp
+        case sensitive = yes
+[hideunwrite]
+        copy = tmp
+        hide unwriteable files = yes
+[print1]
+        copy = tmp
+        printable = yes
 
 [print2]
@@ -527 +690 @@
 [print3]
         copy = print1
-[print4]
+[lp]
         copy = print1
+[print\$]
+        copy = tmp
         ";
         close(CONF);
@@ -537 +702 @@
 
         open(PASSWD, ">$nss_wrapper_passwd") or die("Unable to open $nss_wrapper_passwd");
-        print PASSWD "nobody:x:65534:65533:nobody gecos:$prefix_abs:/bin/false
-root:x:65533:65532:root gecos:$prefix_abs:/bin/false
+        print PASSWD "nobody:x:$uid_nobody:$gid_nobody:nobody gecos:$prefix_abs:/bin/false
 $unix_name:x:$unix_uid:$unix_gids[0]:$unix_name gecos:$prefix_abs:/bin/false
 ";
+        if ($unix_uid != 0) {
+                print PASSWD "root:x:$uid_root:$gid_root:root gecos:$prefix_abs:/bin/false";
+        }
         close(PASSWD);
 
         open(GROUP, ">$nss_wrapper_group") or die("Unable to open $nss_wrapper_group");
-        print GROUP "nobody:x:65533:
-nogroup:x:65534:nobody
-root:x:65532:
+        print GROUP "nobody:x:$gid_nobody:
+nogroup:x:$gid_nogroup:nobody
 $unix_name-group:x:$unix_gids[0]:
+domusers:X:$gid_domusers:
 ";
+        if ($unix_gids[0] != 0) {
+                print GROUP "root:x:$gid_root:";
+        }
+
         close(GROUP);
+
+        foreach my $evlog (@eventlog_list) {
+                my $evlogtdb = "$eventlogdir/$evlog.tdb";
+                open(EVENTLOG, ">$evlogtdb") or die("Unable to open $evlogtdb");
+                close(EVENTLOG);
+        }
 
         $ENV{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd;
@@ -557 +734 @@
         print PWD "$password\n$password\n";
         close(PWD) or die("Unable to set password for test account");
-
-        delete $ENV{NSS_WRAPPER_PASSWD};
-        delete $ENV{NSS_WRAPPER_GROUP};
 
         print "DONE\n";
@@ -574 +748 @@
         $ret{SERVER} = $server;
         $ret{USERNAME} = $unix_name;
+        $ret{USERID} = $unix_uid;
         $ret{DOMAIN} = $domain;
         $ret{NETBIOSNAME} = $server;
@@ -580 +755 @@
         $ret{WINBINDD_SOCKET_DIR} = $wbsockdir;
         $ret{WINBINDD_PRIV_PIPE_DIR} = $wbsockprivdir;
+        $ret{NMBD_SOCKET_DIR} = $nmbdsockdir;
         $ret{SOCKET_WRAPPER_DEFAULT_IFACE} = $swiface;
         $ret{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd;
         $ret{NSS_WRAPPER_GROUP} = $nss_wrapper_group;
         $ret{NSS_WRAPPER_WINBIND_SO_PATH} = $ENV{NSS_WRAPPER_WINBIND_SO_PATH};
+        $ret{LOCAL_PATH} = "$shrdir";
 
         return \%ret;
@@ -606 +783 @@
         system($self->binpath("smbclient") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER_IP} -U% -p 139 | head -2");
 
+        # Ensure we have domain users mapped.
+        system($self->binpath("net") ." $envvars->{CONFIGURATION} groupmap add rid=513 unixgroup=domusers type=domain");
+
         print $self->getlog_env($envvars);
 }

trunk/server/selftest/target/Samba4.pm

@@ -10 +10 @@
 use FindBin qw($RealBin);
 use POSIX;
+use SocketWrapper;
 
 sub new($$$$$) {
-        my ($classname, $bindir, $ldap, $setupdir, $exeext) = @_;
+        my ($classname, $bindir, $ldap, $srcdir, $exeext) = @_;
         $exeext = "" unless defined($exeext);
-        my $self = { 
-                vars => {}, 
-                ldap => $ldap, 
-                bindir => $bindir, 
-                setupdir => $setupdir,
+        my $self = {
+                vars => {},
+                ldap => $ldap,
+                bindir => $bindir,
+                srcdir => $srcdir,
                 exeext => $exeext
         };
@@ -28 +29 @@
         my ($self, $path) = @_;
 
-        return "$self->{bindir}/$path$self->{exeext}";
+        my $valpath = "$self->{bindir}/$path$self->{exeext}";
+
+        return $valpath if (-f $valpath);
+        return $path;
+}
+
+sub scriptdir_path($$) {
+        my ($self, $path) = @_;
+        return "$self->{srcdir}/source4/scripting/$path";
 }
 
@@ -54 +63 @@
         }
         while (system("$ldbsearch -H $uri -s base -b \"\" supportedLDAPVersion > /dev/null") != 0) {
-                $count++;
+                $count++;
                 if ($count > 40) {
-                    $self->slapd_stop($env_vars);
-                    return 0;
+                        $self->slapd_stop($env_vars);
+                        return 0;
                 }
                 sleep(1);
@@ -68 +77 @@
         my ($self, $envvars) = @_;
         if ($self->{ldap} eq "fedora-ds") {
-                system("$envvars->{LDAPDIR}/slapd-samba4/stop-slapd");
+                system("$envvars->{LDAPDIR}/slapd-$envvars->{LDAP_INSTANCE}/stop-slapd");
         } elsif ($self->{ldap} eq "openldap") {
-                open(IN, "<$envvars->{OPENLDAP_PIDFILE}") or 
-                        die("unable to open slapd pid file: $envvars->{OPENLDAP_PIDFILE}");
+                unless (open(IN, "<$envvars->{OPENLDAP_PIDFILE}")) {
+                        warn("unable to open slapd pid file: $envvars->{OPENLDAP_PIDFILE}");
+                        return 0;
+                }
                 kill 9, <IN>;
                 close(IN);
@@ -78 +89 @@
 }
 
-sub check_or_start($$$) 
+sub check_or_start($$$)
 {
         my ($self, $env_vars, $max_time) = @_;
@@ -87 +98 @@
         unlink($env_vars->{SAMBA_TEST_LOG});
         
-        print "STARTING SAMBA... ";
+        my $pwd = `pwd`;
+        print "STARTING SAMBA for $ENV{ENVNAME}\n";
         my $pid = fork();
         if ($pid == 0) {
@@ -102 +114 @@
                 if (defined($ENV{SAMBA_VALGRIND})) {
                     $valgrind = $ENV{SAMBA_VALGRIND};
-                } 
-
-                $ENV{KRB5_CONFIG} = $env_vars->{KRB5_CONFIG}; 
+                }
+
+                $ENV{KRB5_CONFIG} = $env_vars->{KRB5_CONFIG};
                 $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
 
@@ -114 +126 @@
                 # Start slapd before samba, but with the fifo on stdin
                 if (defined($self->{ldap})) {
-                    $self->slapd_start($env_vars) or 
-                        die("couldn't start slapd (main run)");
+                        unless($self->slapd_start($env_vars)) {
+                                warn("couldn't start slapd (main run)");
+                                return undef;
+                        }
                 }
 
@@ -129 +143 @@
                 # allow selection of the process model using
                 # the environment varibale SAMBA_PROCESS_MODEL
-                # that allows us to change the process model for 
+                # that allows us to change the process model for
                 # individual machines in the build farm
                 my $model = "single";
@@ -135 +149 @@
                         $model = $ENV{SAMBA_PROCESS_MODEL};
                 }
-                my $ret = system("$valgrind $samba $optarg $env_vars->{CONFIGURATION} -M $model -i");
-                if ($? == -1) {
-                        print "Unable to start $samba: $ret: $!\n";
+                chomp($pwd);
+                my $cmdline = "$valgrind ${pwd}/$samba $optarg $env_vars->{CONFIGURATION} -M $model -i";
+                my $ret = system("$cmdline");
+                if ($ret == -1) {
+                        print "Unable to start $cmdline: $ret: $!\n";
                         exit 1;
                 }
+                my $exit = ($ret >> 8);
                 unlink($env_vars->{SAMBA_TEST_FIFO});
-                my $exit = $? >> 8;
-                if ( $ret == 0 ) {
-                        print "$samba exits with status $exit\n";
+                if ($ret == 0) {
+                        print "$samba exited with no error\n";
+                        exit 0;
                 } elsif ( $ret & 127 ) {
                         print "$samba got signal ".($ret & 127)." and exits with $exit!\n";
                 } else {
-                        $ret = $? >> 8;
                         print "$samba failed with status $exit!\n";
+                }
+                if ($exit == 0) {
+                        $exit = -1;
                 }
                 exit $exit;
@@ -166 +185 @@
         sleep 2;
 
-        # This will return quickly when things are up, but be slow if we 
-        # need to wait for (eg) SSL init 
+        # This will return quickly when things are up, but be slow if we
+        # need to wait for (eg) SSL init
         my $nmblookup = $self->bindir_path("nmblookup");
         system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{SERVER}");
@@ -192 +211 @@
         open(LDIF, "|$ldbadd -H $file >/dev/null");
         print LDIF $ldif;
-        return close(LDIF);
+        return(close(LDIF));
 }
 
@@ -200 +219 @@
 
         return $self->write_ldb_file("$privatedir/wins_config.ldb", "
-dn: name=TORTURE_6,CN=PARTNERS
+dn: name=TORTURE_11,CN=PARTNERS
 objectClass: wreplPartner
-name: TORTURE_6
-address: 127.0.0.6
+name: TORTURE_11
+address: 127.0.0.11
 pullInterval: 0
 pushChangeCount: 0
@@ -212 +231 @@
 sub mk_fedora_ds($$)
 {
-        my ($self, $ldapdir) = @_;
+        my ($self, $ctx) = @_;
 
         #Make the subdirectory be as fedora DS would expect
-        my $fedora_ds_dir = "$ldapdir/slapd-samba4";
-
-        my $pidfile = "$fedora_ds_dir/logs/slapd-samba4.pid";
+        my $fedora_ds_dir = "$ctx->{ldapdir}/slapd-$ctx->{ldap_instance}";
+
+        my $pidfile = "$fedora_ds_dir/logs/slapd-$ctx->{ldap_instance}.pid";
 
         return ($fedora_ds_dir, $pidfile);
@@ -224 +243 @@
 sub mk_openldap($$)
 {
-        my ($self, $ldapdir) = @_;
-
-        my $slapd_conf_d = "$ldapdir/slapd.d";
-        my $pidfile = "$ldapdir/slapd.pid";
+        my ($self, $ctx) = @_;
+
+        my $slapd_conf_d = "$ctx->{ldapdir}/slapd.d";
+        my $pidfile = "$ctx->{ldapdir}/slapd.pid";
 
         return ($slapd_conf_d, $pidfile);
@@ -261 +280 @@
         close(DHFILE);
 
-        #Likewise, we pregenerate the key material.  This allows the 
+        #Likewise, we pregenerate the key material.  This allows the
         #other certificates to be pre-generated
         open(KEYFILE, ">$keyfile");
@@ -303 +322 @@
 EOF
 
-        #generated with 
+        #generated with
         # hxtool issue-certificate --self-signed --issue-ca \
         # --ca-private-key="FILE:$KEYFILE" \
@@ -327 +346 @@
 EOF
 
-        #generated with GNUTLS internally in Samba.  
+        #generated with GNUTLS internally in Samba.
 
         open(CERTFILE, ">$certfile");
@@ -441 +460 @@
 }
 
-#
-# provision_raw_prepare() is also used by Samba34.pm!
-#
-sub provision_raw_prepare($$$$$$$)
-{
-        my ($self, $prefix, $server_role, $netbiosname, $netbiosalias, $swiface, $password, $kdc_ipv4) = @_;
-        my $ctx;
-
-        -d $prefix or mkdir($prefix, 0777) or die("Unable to create $prefix");
-        my $prefix_abs = abs_path($prefix);
-
-        die ("prefix=''") if $prefix_abs eq "";
-        die ("prefix='/'") if $prefix_abs eq "/";
-
-        (system("rm -rf $prefix_abs/*") == 0) or die("Unable to clean up");
-
-        $ctx->{prefix} = $prefix;
-        $ctx->{prefix_abs} = $prefix_abs;
-        $ctx->{server_role} = $server_role;
-        $ctx->{netbiosname} = $netbiosname;
-        $ctx->{netbiosalias} = $netbiosalias;
-        $ctx->{swiface} = $swiface;
-        $ctx->{password} = $password;
-        $ctx->{kdc_ipv4} = $kdc_ipv4;
-
-        $ctx->{server_loglevel} = 1;
-        $ctx->{username} = "Administrator";
-        $ctx->{domain} = "SAMBADOMAIN";
-        $ctx->{realm} = "SAMBA.EXAMPLE.COM";
-        $ctx->{dnsname} = "samba.example.com";
-        $ctx->{basedn} = "dc=samba,dc=example,dc=com";
-
-        my $unix_name = ($ENV{USER} or $ENV{LOGNAME} or `whoami`);
-        chomp $unix_name;
-        $ctx->{unix_name} = $unix_name;
-        $ctx->{unix_uid} = $>;
-        $ctx->{unix_gids_str} = $);
-        @{$ctx->{unix_gids}} = split(" ", $ctx->{unix_gids_str});
-
-        $ctx->{etcdir} = "$prefix_abs/etc";
-        $ctx->{piddir} = "$prefix_abs/pid";
-        $ctx->{smb_conf} = "$ctx->{etcdir}/smb.conf";
-        $ctx->{krb5_conf} = "$ctx->{etcdir}/krb5.conf";
-        $ctx->{privatedir} = "$prefix_abs/private";
-        $ctx->{ncalrpcdir} = "$prefix_abs/ncalrpc";
-        $ctx->{lockdir} = "$prefix_abs/lockdir";
-        $ctx->{winbindd_socket_dir} = "$prefix_abs/winbindd_socket";
-        $ctx->{winbindd_privileged_socket_dir} = "$prefix_abs/winbindd_privileged_socket";
-        $ctx->{ntp_signd_socket_dir} = "$prefix_abs/ntp_signd_socket";
-        $ctx->{nsswrap_passwd} = "$ctx->{etcdir}/passwd";
-        $ctx->{nsswrap_group} = "$ctx->{etcdir}/group";
-
-        $ctx->{tlsdir} = "$ctx->{privatedir}/tls";
-
-        $ctx->{ipv4} = "127.0.0.$swiface";
-        $ctx->{interfaces} = "$ctx->{ipv4}/8";
-
-        $ctx->{localbasedn} = $ctx->{basedn};
-        $ctx->{localbasedn} = "CN=$netbiosname" if $server_role eq "member server";
-
-        push(@{$ctx->{directories}}, $ctx->{privatedir});
-        push(@{$ctx->{directories}}, $ctx->{etcdir});
-        push(@{$ctx->{directories}}, $ctx->{piddir});
-        push(@{$ctx->{directories}}, $ctx->{ncalrpcdir});
-        push(@{$ctx->{directories}}, $ctx->{lockdir});
-
-        $ctx->{smb_conf_extra_options} = "";
-
-        my @provision_options = ();
-        push (@provision_options, "NSS_WRAPPER_PASSWD=\"$ctx->{nsswrap_passwd}\"");
-        push (@provision_options, "NSS_WRAPPER_GROUP=\"$ctx->{nsswrap_group}\"");
-        if (defined($ENV{GDB_PROVISION})) {
-                push (@provision_options, "gdb --args");
-        }
-        if (defined($ENV{VALGRIND_PROVISION})) {
-                push (@provision_options, "valgrind");
-        }
-        if (defined($ENV{PYTHON})) {
-                push (@provision_options, $ENV{PYTHON});
-        }
-        push (@provision_options, "$self->{setupdir}/provision");
-        push (@provision_options, "--configfile=$ctx->{smb_conf}");
-        push (@provision_options, "--host-name=$ctx->{netbiosname}");
-        push (@provision_options, "--host-ip=$ctx->{ipv4}");
-        push (@provision_options, "--quiet");
-        push (@provision_options, "--domain=$ctx->{domain}");
-        push (@provision_options, "--realm=$ctx->{realm}");
-        push (@provision_options, "--adminpass=$ctx->{password}");
-        push (@provision_options, "--krbtgtpass=krbtgt$ctx->{password}");
-        push (@provision_options, "--machinepass=machine$ctx->{password}");
-        push (@provision_options, "--root=$ctx->{unix_name}");
-        push (@provision_options, "--server-role=\"$ctx->{server_role}\"");
-
-        @{$ctx->{provision_options}} = @provision_options;
-
-        return $ctx;
-}
-
-#
-# provision_raw_step1() is also used by Samba34.pm!
-#
-# Step1 creates the basic configuration
-#
-sub provision_raw_step1($$)
+sub mk_krb5_conf($$)
 {
         my ($self, $ctx) = @_;
 
-        mkdir($_, 0777) foreach (@{$ctx->{directories}});
-
-        open(CONFFILE, ">$ctx->{smb_conf}")
-                or die("can't open $ctx->{smb_conf}$?");
-        print CONFFILE "
-[global]
-        netbios name = $ctx->{netbiosname}
-        netbios aliases = $ctx->{netbiosalias}
-        workgroup = $ctx->{domain}
-        realm = $ctx->{realm}
-        private dir = $ctx->{privatedir}
-        pid directory = $ctx->{piddir}
-        ncalrpc dir = $ctx->{ncalrpcdir}
-        lock dir = $ctx->{lockdir}
-        setup directory = $self->{setupdir}
-        modules dir = $self->{bindir}/modules
-        winbindd socket directory = $ctx->{winbindd_socket_dir}
-        winbindd privileged socket directory = $ctx->{winbindd_privileged_socket_dir}
-        ntp signd socket directory = $ctx->{ntp_signd_socket_dir}
-        winbind separator = /
-        name resolve order = bcast
-        interfaces = $ctx->{interfaces}
-        tls dh params file = $ctx->{tlsdir}/dhparms.pem
-        panic action = $RealBin/gdb_backtrace \%PID% \%PROG%
-        wins support = yes
-        server role = $ctx->{server_role}
-        notify:inotify = false
-        ldb:nosync = true
-#We don't want to pass our self-tests if the PAC code is wrong
-        gensec:require_pac = true
-        log level = $ctx->{server_loglevel}
-        lanman auth = Yes
-
-        # Begin extra options
-        $ctx->{smb_conf_extra_options}
-        # End extra options
-";
-        close(CONFFILE);
-
-        $self->mk_keyblobs($ctx->{tlsdir});
-
-        open(KRB5CONF, ">$ctx->{krb5_conf}")
-                or die("can't open $ctx->{krb5_conf}$?");
+        unless (open(KRB5CONF, ">$ctx->{krb5_conf}")) {
+                warn("can't open $ctx->{krb5_conf}$?");
+                return undef;
+        }
         print KRB5CONF "
 #Generated krb5.conf for $ctx->{realm}
@@ -600 +477 @@
  ticket_lifetime = 24h
  forwardable = yes
+ allow_weak_crypto = yes
 
 [realms]
@@ -630 +508 @@
 ";
         close(KRB5CONF);
+}
+
+sub provision_raw_prepare($$$$$$$$$$)
+{
+        my ($self, $prefix, $server_role, $netbiosname, $netbiosalias,
+            $domain, $realm, $functional_level,
+            $swiface, $password, $kdc_ipv4) = @_;
+        my $ctx;
+
+        unless(-d $prefix or mkdir($prefix, 0777)) {
+                warn("Unable to create $prefix");
+                return undef;
+        }
+        my $prefix_abs = abs_path($prefix);
+
+        die ("prefix=''") if $prefix_abs eq "";
+        die ("prefix='/'") if $prefix_abs eq "/";
+
+        unless (system("rm -rf $prefix_abs/*") == 0) {
+                warn("Unable to clean up");
+        }
+
+        $ctx->{prefix} = $prefix;
+        $ctx->{prefix_abs} = $prefix_abs;
+        
+        $ctx->{dns_host_file} = "$ENV{SELFTEST_PREFIX}/dns_host_file";
+
+        $ctx->{server_role} = $server_role;
+        $ctx->{netbiosname} = $netbiosname;
+        $ctx->{netbiosalias} = $netbiosalias;
+        $ctx->{swiface} = $swiface;
+        $ctx->{password} = $password;
+        $ctx->{kdc_ipv4} = $kdc_ipv4;
+
+        $ctx->{server_loglevel} =$ENV{SERVER_LOG_LEVEL} || 1;
+        $ctx->{username} = "Administrator";
+        $ctx->{domain} = $domain;
+        $ctx->{realm} = uc($realm);
+        $ctx->{dnsname} = lc($realm);
+        $ctx->{sid_generator} = "internal";
+
+        $ctx->{functional_level} = $functional_level;
+
+        my $unix_name = ($ENV{USER} or $ENV{LOGNAME} or `whoami`);
+        chomp $unix_name;
+        $ctx->{unix_name} = $unix_name;
+        $ctx->{unix_uid} = $>;
+        $ctx->{unix_gids_str} = $);
+        @{$ctx->{unix_gids}} = split(" ", $ctx->{unix_gids_str});
+
+        $ctx->{etcdir} = "$prefix_abs/etc";
+        $ctx->{piddir} = "$prefix_abs/pid";
+        $ctx->{smb_conf} = "$ctx->{etcdir}/smb.conf";
+        $ctx->{krb5_conf} = "$ctx->{etcdir}/krb5.conf";
+        $ctx->{privatedir} = "$prefix_abs/private";
+        $ctx->{ncalrpcdir} = "$prefix_abs/ncalrpc";
+        $ctx->{lockdir} = "$prefix_abs/lockdir";
+        $ctx->{winbindd_socket_dir} = "$prefix_abs/winbindd_socket";
+        $ctx->{winbindd_privileged_socket_dir} = "$prefix_abs/winbindd_privileged_socket";
+        $ctx->{ntp_signd_socket_dir} = "$prefix_abs/ntp_signd_socket";
+        $ctx->{nsswrap_passwd} = "$ctx->{etcdir}/passwd";
+        $ctx->{nsswrap_group} = "$ctx->{etcdir}/group";
+
+        $ctx->{tlsdir} = "$ctx->{privatedir}/tls";
+
+        $ctx->{ipv4} = "127.0.0.$swiface";
+        $ctx->{interfaces} = "$ctx->{ipv4}/8";
+
+        push(@{$ctx->{directories}}, $ctx->{privatedir});
+        push(@{$ctx->{directories}}, $ctx->{etcdir});
+        push(@{$ctx->{directories}}, $ctx->{piddir});
+        push(@{$ctx->{directories}}, $ctx->{ncalrpcdir});
+        push(@{$ctx->{directories}}, $ctx->{lockdir});
+
+        $ctx->{smb_conf_extra_options} = "";
+
+        my @provision_options = ();
+        push (@provision_options, "NSS_WRAPPER_PASSWD=\"$ctx->{nsswrap_passwd}\"");
+        push (@provision_options, "NSS_WRAPPER_GROUP=\"$ctx->{nsswrap_group}\"");
+        if (defined($ENV{GDB_PROVISION})) {
+                push (@provision_options, "gdb --args");
+                if (!defined($ENV{PYTHON})) {
+                    push (@provision_options, "env");
+                    push (@provision_options, "python");
+                }
+        }
+        if (defined($ENV{VALGRIND_PROVISION})) {
+                push (@provision_options, "valgrind");
+                if (!defined($ENV{PYTHON})) {
+                    push (@provision_options, "env");
+                    push (@provision_options, "python");
+                }
+        }
+        if (defined($ENV{PYTHON})) {
+                push (@provision_options, $ENV{PYTHON});
+        }
+        push (@provision_options, "$self->{srcdir}/source4/setup/provision");
+        push (@provision_options, "--configfile=$ctx->{smb_conf}");
+        push (@provision_options, "--host-name=$ctx->{netbiosname}");
+        push (@provision_options, "--host-ip=$ctx->{ipv4}");
+        push (@provision_options, "--quiet");
+        push (@provision_options, "--domain=$ctx->{domain}");
+        push (@provision_options, "--realm=$ctx->{realm}");
+        push (@provision_options, "--adminpass=$ctx->{password}");
+        push (@provision_options, "--krbtgtpass=krbtgt$ctx->{password}");
+        push (@provision_options, "--machinepass=machine$ctx->{password}");
+        push (@provision_options, "--root=$ctx->{unix_name}");
+        push (@provision_options, "--server-role=\"$ctx->{server_role}\"");
+        push (@provision_options, "--function-level=\"$ctx->{functional_level}\"");
+
+        @{$ctx->{provision_options}} = @provision_options;
+
+        return $ctx;
+}
+
+#
+# Step1 creates the basic configuration
+#
+sub provision_raw_step1($$)
+{
+        my ($self, $ctx) = @_;
+
+        mkdir($_, 0777) foreach (@{$ctx->{directories}});
+
+        unless (open(CONFFILE, ">$ctx->{smb_conf}")) {
+                warn("can't open $ctx->{smb_conf}$?");
+                return undef;
+        }
+        print CONFFILE "
+[global]
+        netbios name = $ctx->{netbiosname}
+        netbios aliases = $ctx->{netbiosalias}
+        posix:eadb = $ctx->{lockdir}/eadb.tdb
+        workgroup = $ctx->{domain}
+        realm = $ctx->{realm}
+        private dir = $ctx->{privatedir}
+        pid directory = $ctx->{piddir}
+        ncalrpc dir = $ctx->{ncalrpcdir}
+        lock dir = $ctx->{lockdir}
+        winbindd socket directory = $ctx->{winbindd_socket_dir}
+        winbindd privileged socket directory = $ctx->{winbindd_privileged_socket_dir}
+        ntp signd socket directory = $ctx->{ntp_signd_socket_dir}
+        winbind separator = /
+        name resolve order = file bcast
+        interfaces = $ctx->{interfaces}
+        tls dh params file = $ctx->{tlsdir}/dhparms.pem
+        panic action = $RealBin/gdb_backtrace \%PID% \%PROG%
+        wins support = yes
+        server role = $ctx->{server_role}
+        server services = +echo
+        notify:inotify = false
+        ldb:nosync = true
+#We don't want to pass our self-tests if the PAC code is wrong
+        gensec:require_pac = true
+        log level = $ctx->{server_loglevel}
+        lanman auth = Yes
+        rndc command = true
+        dns update command = $ENV{SRCDIR_ABS}/source4/scripting/bin/samba_dnsupdate --all-interfaces --use-file=$ctx->{dns_host_file}
+        spn update command = $ENV{SRCDIR_ABS}/source4/scripting/bin/samba_spnupdate
+        resolv:host file = $ctx->{dns_host_file}
+        dreplsrv:periodic_startup_interval = 0
+";
+
+        if (defined($ctx->{sid_generator}) && $ctx->{sid_generator} ne "internal") {
+                print CONFFILE "
+        sid generator = $ctx->{sid_generator}";
+        }
+
+        print CONFFILE "
+
+        # Begin extra options
+        $ctx->{smb_conf_extra_options}
+        # End extra options
+";
+        close(CONFFILE);
+
+        $self->mk_keyblobs($ctx->{tlsdir});
+
+        $self->mk_krb5_conf($ctx);
 
         open(PWD, ">$ctx->{nsswrap_passwd}");
@@ -652 +709 @@
 
 #Ensure the config file is valid before we start
-        my $testparm = $self->bindir_path("testparm");
+        my $testparm = $self->scriptdir_path("bin/testparm");
         if (system("$testparm $configuration -v --suppress-prompt >/dev/null 2>&1") != 0) {
                 system("$testparm -v --suppress-prompt $configuration >&2");
-                die("Failed to create a valid smb.conf configuration $testparm!");
-        }
-
-        (system("($testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global 2> /dev/null | grep -i \"^$ctx->{netbiosname}\" ) >/dev/null 2>&1") == 0) or die("Failed to create a valid smb.conf configuration! $self->{bindir}/testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global");
+                warn("Failed to create a valid smb.conf configuration $testparm!");
+                return undef;
+        }
+        unless (system("($testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global 2> /dev/null | grep -i \"^$ctx->{netbiosname}\" ) >/dev/null 2>&1") == 0) {
+                warn("Failed to create a valid smb.conf configuration! $testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global");
+                return undef;
+        }
 
         my $ret = {
@@ -672 +732 @@
                 PASSWORD => $ctx->{password},
                 LDAPDIR => $ctx->{ldapdir},
+                LDAP_INSTANCE => $ctx->{ldap_instance},
                 WINBINDD_SOCKET_DIR => $ctx->{winbindd_socket_dir},
                 NCALRPCDIR => $ctx->{ncalrpcdir},
@@ -689 +750 @@
 
 #
-# provision_raw_step2() is also used by Samba34.pm!
-#
 # Step2 runs the provision script
 #
@@ -698 +757 @@
 
         my $provision_cmd = join(" ", @{$ctx->{provision_options}});
-        (system($provision_cmd) == 0) or die("Unable to provision: \n$provision_cmd\n");
+        unless (system($provision_cmd) == 0) {
+                warn("Unable to provision: \n$provision_cmd\n");
+                return undef;
+        }
 
         return $ret;
 }
 
-sub provision($$$$$$$)
-{
-        my ($self, $prefix, $server_role, $netbiosname, $netbiosalias, $swiface, $password, $kdc_ipv4) = @_;
+sub provision($$$$$$$$$)
+{
+        my ($self, $prefix, $server_role, $netbiosname, $netbiosalias,
+            $domain, $realm, $functional_level,
+            $swiface, $password, $kdc_ipv4, $extra_smbconf_options) = @_;
 
         my $ctx = $self->provision_raw_prepare($prefix, $server_role,
                                                $netbiosname, $netbiosalias,
+                                               $domain, $realm, $functional_level,
                                                $swiface, $password, $kdc_ipv4);
 
@@ -715 +780 @@
         push(@{$ctx->{directories}}, "$ctx->{tmpdir}/test1");
         push(@{$ctx->{directories}}, "$ctx->{tmpdir}/test2");
-
+        my $msdfs = "no";
+        $msdfs = "yes" if ($server_role eq "domain controller");
         $ctx->{smb_conf_extra_options} = "
 
         max xmit = 32K
         server max protocol = SMB2
+        $extra_smbconf_options
+        host msdfs = $msdfs
+        lanman auth = yes
 
 [tmp]
         path = $ctx->{tmpdir}
         read only = no
-        posix:sharedelay = 100000
-        posix:eadb = $ctx->{lockdir}/eadb.tdb
+        posix:sharedelay = 10000
         posix:oplocktimeout = 3
         posix:writetimeupdatedelay = 500000
@@ -732 +800 @@
         path = $ctx->{tmpdir}/test1
         read only = no
-        posix:sharedelay = 100000
-        posix:eadb = $ctx->{lockdir}/eadb.tdb
+        posix:sharedelay = 10000
         posix:oplocktimeout = 3
-        posix:writetimeupdatedelay = 500000
+        posix:writetimeupdatedelay = 50000
 
 [test2]
         path = $ctx->{tmpdir}/test2
         read only = no
-        posix:sharedelay = 100000
-        posix:eadb = $ctx->{lockdir}/eadb.tdb
+        posix:sharedelay = 10000
         posix:oplocktimeout = 3
-        posix:writetimeupdatedelay = 500000
+        posix:writetimeupdatedelay = 50000
 
 [cifs]
@@ -779 +845 @@
                 $ldap_uri = "ldapi://$ldap_uri";
                 $ctx->{ldap_uri} = $ldap_uri;
+                if ($self->{ldap} eq "fedora-ds") {
+                        $ctx->{sid_generator} = "backend";
+                }
+
+                $ctx->{ldap_instance} = lc($ctx->{netbiosname});
         }
 
         my $ret = $self->provision_raw_step1($ctx);
+        unless (defined $ret) {
+                return undef;
+        }
 
         if (defined($self->{ldap})) {
-                $ret->{LDAP_URI} = $ctx->{ldap_uri};
+                $ret->{LDAP_URI} = $ctx->{ldap_uri};
                 push (@{$ctx->{provision_options}}, "--ldap-backend-type=" . $self->{ldap});
+                push (@{$ctx->{provision_options}}, "--ldap-backend-nosync");
                 if ($self->{ldap} eq "openldap") {
-                        push (@{$ctx->{provision_options}}, "--slapd-path=" . $ENV{OPENLDAP_SLAPD});
-                        ($ret->{SLAPD_CONF_D}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ctx->{ldapdir}) or die("Unable to create openldap directories");
+                        push (@{$ctx->{provision_options}}, "--slapd-path=" . $ENV{OPENLDAP_SLAPD});
+                        ($ret->{SLAPD_CONF_D}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ctx) or die("Unable to create openldap directories");
 
                 } elsif ($self->{ldap} eq "fedora-ds") {
                         push (@{$ctx->{provision_options}}, "--slapd-path=" . "$ENV{FEDORA_DS_ROOT}/sbin/ns-slapd");
                         push (@{$ctx->{provision_options}}, "--setup-ds-path=" . "$ENV{FEDORA_DS_ROOT}/sbin/setup-ds.pl");
-                        ($ret->{FEDORA_DS_DIR}, $ret->{FEDORA_DS_PIDFILE}) = $self->mk_fedora_ds($ctx->{ldapdir}) or die("Unable to create fedora ds directories");
-                }
-
-        }
-
-        $ret = $self->provision_raw_step2($ctx, $ret);
-
-        return $ret;
+                        ($ret->{FEDORA_DS_DIR}, $ret->{FEDORA_DS_PIDFILE}) = $self->mk_fedora_ds($ctx) or die("Unable to create fedora ds directories");
+                }
+
+        }
+
+        return $self->provision_raw_step2($ctx, $ret);
 }
 
@@ -810 +883 @@
         my $ret = $self->provision($prefix,
                                    "member server",
-                                   "localmember3",
                                    "localmember",
+                                   "member3",
+                                   "SAMBADOMAIN",
+                                   "samba.example.com",
+                                   "2008",
                                    3,
-                                   "localmemberpass",
-                                   $dcvars->{SERVER_IP});
-
-        $ret or die("Unable to provision");
-
-        my $net = $self->bindir_path("net");
+                                   "locMEMpass3",
+                                   $dcvars->{SERVER_IP},
+                                   "");
+        unless ($ret) {
+                return undef;
+        }
+
+        my $samba_tool = $self->bindir_path("samba-tool");
         my $cmd = "";
         $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
         $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
-        $cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{DOMAIN} member";
-        $cmd .= " -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}";
-
-        system($cmd) == 0 or die("Join failed\n$cmd");
-
-        $ret->{DC_SERVER} = $dcvars->{SERVER};
-        $ret->{DC_SERVER_IP} = $dcvars->{SERVER_IP};
-        $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
-        $ret->{DC_NETBIOSALIAS} = $dcvars->{NETBIOSALIAS};
-        $ret->{DC_USERNAME} = $dcvars->{USERNAME};
-        $ret->{DC_PASSWORD} = $dcvars->{PASSWORD};
+        $cmd .= "$samba_tool join $ret->{CONFIGURATION} $dcvars->{REALM} member";
+        $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
+
+        unless (system($cmd) == 0) {
+                warn("Join failed\n$cmd");
+                return undef;
+        }
+
+        $ret->{MEMBER_SERVER} = $ret->{SERVER};
+        $ret->{MEMBER_SERVER_IP} = $ret->{SERVER_IP};
+        $ret->{MEMBER_NETBIOSNAME} = $ret->{NETBIOSNAME};
+        $ret->{MEMBER_NETBIOSALIAS} = $ret->{NETBIOSALIAS};
+        $ret->{MEMBER_USERNAME} = $ret->{USERNAME};
+        $ret->{MEMBER_PASSWORD} = $ret->{PASSWORD};
+
+        $ret->{DC_SERVER} = $dcvars->{DC_SERVER};
+        $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP};
+        $ret->{DC_NETBIOSNAME} = $dcvars->{DC_NETBIOSNAME};
+        $ret->{DC_NETBIOSALIAS} = $dcvars->{DC_NETBIOSALIAS};
+        $ret->{DC_USERNAME} = $dcvars->{DC_USERNAME};
+        $ret->{DC_PASSWORD} = $dcvars->{DC_PASSWORD};
+
+        return $ret;
+}
+
+sub provision_rpc_proxy($$$)
+{
+        my ($self, $prefix, $dcvars) = @_;
+        print "PROVISIONING RPC PROXY...";
+
+        my $extra_smbconf_options = "dcerpc_remote:binding = ncacn_ip_tcp:localdc
+       dcerpc endpoint servers = epmapper, remote
+       dcerpc_remote:interfaces = rpcecho
+";
+
+        my $ret = $self->provision($prefix,
+                                   "member server",
+                                   "localrpcproxy",
+                                   "rpcproxy4",
+                                   "SAMBADOMAIN",
+                                   "samba.example.com",
+                                   "2008",
+                                   4,
+                                   "locRPCproxypass4",
+                                   $dcvars->{SERVER_IP},
+                                   $extra_smbconf_options);
+
+        unless ($ret) {
+                return undef;
+        }
+
+        my $samba_tool = $self->bindir_path("samba-tool");
+        my $cmd = "";
+        $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+        $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
+        $cmd .= "$samba_tool join $ret->{CONFIGURATION} $dcvars->{REALM} member";
+        $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
+
+        unless (system($cmd) == 0) {
+                warn("Join failed\n$cmd");
+                return undef;
+        }
+
+        $ret->{RPC_PROXY_SERVER} = $ret->{SERVER};
+        $ret->{RPC_PROXY_SERVER_IP} = $ret->{SERVER_IP};
+        $ret->{RPC_PROXY_NETBIOSNAME} = $ret->{NETBIOSNAME};
+        $ret->{RPC_PROXY_NETBIOSALIAS} = $ret->{NETBIOSALIAS};
+        $ret->{RPC_PROXY_USERNAME} = $ret->{USERNAME};
+        $ret->{RPC_PROXY_PASSWORD} = $ret->{PASSWORD};
+
+        return $ret;
+}
+
+sub provision_vampire_dc($$$)
+{
+        my ($self, $prefix, $dcvars) = @_;
+        print "PROVISIONING VAMPIRE DC...";
+
+        # We do this so that we don't run the provision.  That's the job of 'net vampire'.
+        my $ctx = $self->provision_raw_prepare($prefix, "domain controller",
+                                               "localvampiredc",
+                                               "dc2",
+                                               "SAMBADOMAIN",
+                                               "samba.example.com",
+                                               "2008",
+                                               2, $dcvars->{PASSWORD},
+                                               $dcvars->{SERVER_IP});
+
+        $ctx->{smb_conf_extra_options} = "
+        max xmit = 32K
+        server max protocol = SMB2
+
+[sysvol]
+        path = $ctx->{lockdir}/sysvol
+        read only = yes
+
+[netlogon]
+        path = $ctx->{lockdir}/sysvol/$ctx->{dnsname}/scripts
+        read only = no
+
+";
+
+        my $ret = $self->provision_raw_step1($ctx);
+        unless ($ret) {
+                return undef;
+        }
+
+        my $samba_tool = $self->bindir_path("samba-tool");
+        my $cmd = "";
+        $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+        $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
+        $cmd .= "$samba_tool join $ret->{CONFIGURATION} $dcvars->{REALM} DC --realm=$dcvars->{REALM}";
+        $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
+
+        unless (system($cmd) == 0) {
+                warn("Join failed\n$cmd");
+                return undef;
+        }
+
+        $ret->{VAMPIRE_DC_SERVER} = $ret->{SERVER};
+        $ret->{VAMPIRE_DC_SERVER_IP} = $ret->{SERVER_IP};
+        $ret->{VAMPIRE_DC_NETBIOSNAME} = $ret->{NETBIOSNAME};
+        $ret->{VAMPIRE_DC_NETBIOSALIAS} = $ret->{NETBIOSALIAS};
+
+        $ret->{DC_SERVER} = $dcvars->{DC_SERVER};
+        $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP};
+        $ret->{DC_NETBIOSNAME} = $dcvars->{DC_NETBIOSNAME};
+        $ret->{DC_NETBIOSALIAS} = $dcvars->{DC_NETBIOSALIAS};
+        $ret->{DC_USERNAME} = $dcvars->{DC_USERNAME};
+        $ret->{DC_PASSWORD} = $dcvars->{DC_PASSWORD};
 
         return $ret;
@@ -844 +1041 @@
         my $ret = $self->provision($prefix,
                                    "domain controller",
-                                   "localdc1",
                                    "localdc",
+                                   "dc1",
+                                   "SAMBADOMAIN",
+                                   "samba.example.com",
+                                   "2008",
                                    1,
-                                   "localdcpass",
-                                   "127.0.0.1");
-
-        $self->add_wins_config("$prefix/private") or 
-                die("Unable to add wins configuration");
+                                   "locDCpass1",
+                                   "127.0.0.1", "");
+
+        return undef unless(defined $ret);
+        unless($self->add_wins_config("$prefix/private")) {
+                warn("Unable to add wins configuration");
+                return undef;
+        }
+
+        $ret->{DC_SERVER} = $ret->{SERVER};
+        $ret->{DC_SERVER_IP} = $ret->{SERVER_IP};
+        $ret->{DC_NETBIOSNAME} = $ret->{NETBIOSNAME};
+        $ret->{DC_NETBIOSALIAS} = $ret->{NETBIOSALIAS};
+        $ret->{DC_USERNAME} = $ret->{USERNAME};
+        $ret->{DC_PASSWORD} = $ret->{PASSWORD};
+
+        return $ret;
+}
+
+sub provision_fl2000dc($$)
+{
+        my ($self, $prefix) = @_;
+
+        print "PROVISIONING DC...";
+        my $ret = $self->provision($prefix,
+                                   "domain controller",
+                                   "dc5",
+                                   "localfl2000dc",
+                                   "SAMBA2000",
+                                   "samba2000.example.com",
+                                   "2000",
+                                   5,
+                                   "locDCpass5",
+                                   "127.0.0.5", "");
+
+        unless($self->add_wins_config("$prefix/private")) {
+                warn("Unable to add wins configuration");
+                return undef;
+        }
+
+        return $ret;
+}
+
+sub provision_fl2003dc($$)
+{
+        my ($self, $prefix) = @_;
+
+        print "PROVISIONING DC...";
+        my $ret = $self->provision($prefix,
+                                   "domain controller",
+                                   "dc6",
+                                   "localfl2003dc",
+                                   "SAMBA2003",
+                                   "samba2003.example.com",
+                                   "2003",
+                                   6,
+                                   "locDCpass6",
+                                   "127.0.0.6", "");
+
+        unless($self->add_wins_config("$prefix/private")) {
+                warn("Unable to add wins configuration");
+                return undef;
+        }
+
+        return $ret;
+}
+
+sub provision_fl2008r2dc($$)
+{
+        my ($self, $prefix) = @_;
+
+        print "PROVISIONING DC...";
+        my $ret = $self->provision($prefix,
+                                   "domain controller",
+                                   "dc7",
+                                   "localfl2000r2dc",
+                                   "SAMBA2008R2",
+                                   "samba2008R2.example.com",
+                                   "2008_R2",
+                                   7,
+                                   "locDCpass7",
+                                   "127.0.0.7", "");
+
+        unless ($self->add_wins_config("$prefix/private")) {
+                warn("Unable to add wins configuration");
+                return undef;
+        }
+
+        return $ret;
+}
+
+
+sub provision_rodc($$$)
+{
+        my ($self, $prefix, $dcvars) = @_;
+        print "PROVISIONING RODC...";
+
+        # We do this so that we don't run the provision.  That's the job of 'net join RODC'.
+        my $ctx = $self->provision_raw_prepare($prefix, "domain controller",
+                                               "rodc",
+                                               "dc8",
+                                               "SAMBADOMAIN",
+                                               "samba.example.com",
+                                               "2008",
+                                               8, $dcvars->{PASSWORD},
+                                               $dcvars->{SERVER_IP});
+        unless ($ctx) {
+                return undef;
+        }
+
+        $ctx->{tmpdir} = "$ctx->{prefix_abs}/tmp";
+        push(@{$ctx->{directories}}, "$ctx->{tmpdir}");
+
+        $ctx->{smb_conf_extra_options} = "
+        max xmit = 32K
+        server max protocol = SMB2
+
+[sysvol]
+        path = $ctx->{lockdir}/sysvol
+        read only = yes
+
+[netlogon]
+        path = $ctx->{lockdir}/sysvol/$ctx->{dnsname}/scripts
+        read only = yes
+
+[tmp]
+        path = $ctx->{tmpdir}
+        read only = no
+        posix:sharedelay = 10000
+        posix:oplocktimeout = 3
+        posix:writetimeupdatedelay = 500000
+
+";
+
+        my $ret = $self->provision_raw_step1($ctx);
+        unless ($ret) {
+                return undef;
+        }
+
+        my $samba_tool = $self->bindir_path("samba-tool");
+        my $cmd = "";
+        $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+        $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
+        $cmd .= "$samba_tool join $ret->{CONFIGURATION} $dcvars->{REALM} RODC";
+        $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
+        $cmd .= " --server=$dcvars->{DC_SERVER}";
+
+        unless (system($cmd) == 0) {
+                warn("RODC join failed\n$cmd");
+                return undef;
+        }
+
+        # we overwrite the kdc after the RODC join
+        # so that use the RODC as kdc and test
+        # the proxy code
+        $ctx->{kdc_ipv4} = $ret->{SERVER_IP};
+        $self->mk_krb5_conf($ctx);
+
+        $ret->{RODC_DC_SERVER} = $ret->{SERVER};
+        $ret->{RODC_DC_SERVER_IP} = $ret->{SERVER_IP};
+        $ret->{RODC_DC_NETBIOSNAME} = $ret->{NETBIOSNAME};
+        $ret->{RODC_DC_NETBIOSALIAS} = $ret->{NETBIOSALIAS};
+
+        $ret->{DC_SERVER} = $dcvars->{DC_SERVER};
+        $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP};
+        $ret->{DC_NETBIOSNAME} = $dcvars->{DC_NETBIOSNAME};
+        $ret->{DC_NETBIOSALIAS} = $dcvars->{DC_NETBIOSALIAS};
+        $ret->{DC_USERNAME} = $dcvars->{DC_USERNAME};
+        $ret->{DC_PASSWORD} = $dcvars->{DC_PASSWORD};
 
         return $ret;
@@ -863 +1227 @@
         close(DATA);
 
-        if (-f "$envvars->{PIDDIR}/samba.pid" ) {
-                open(IN, "<$envvars->{PIDDIR}/samba.pid") or die("unable to open server pid file");
+        if (open(IN, "<$envvars->{PIDDIR}/samba.pid")) {
                 $pid = <IN>;
                 close(IN);
@@ -872 +1235 @@
                 my $count = 0;
                 until (kill(0, $pid) == 0) {
-                    # if no process sucessfully signalled, then we are done
-                    sleep(1);
-                    $count++;
-                    last if $count > 20;
-                }
-                
+                        # if no process sucessfully signalled, then we are done
+                        sleep(1);
+                        $count++;
+                        last if $count > 20;
+                }
+
                 # If it is still around, kill it
                 if ($count > 20) {
-                    print "server process $pid took more than $count seconds to exit, killing\n";
-                    kill 9, $pid;
+                        print "server process $pid took more than $count seconds to exit, killing\n";
+                        kill 9, $pid;
                 }
         }
@@ -910 +1273 @@
 
         return "" if $out eq $title;
- 
+
         return $out;
 }
@@ -918 +1281 @@
         my ($self, $envvars) = @_;
 
-        return 1 if (-p $envvars->{SAMBA_TEST_FIFO});
-
-        print $self->getlog_env($envvars);
-
-        return 0;
+        return (-p $envvars->{SAMBA_TEST_FIFO});
 }
 
@@ -928 +1287 @@
 {
         my ($self, $envname, $path) = @_;
+
+        $ENV{ENVNAME} = $envname;
 
         if ($envname eq "dc") {
                 return $self->setup_dc("$path/dc");
+        } elsif ($envname eq "fl2000dc") {
+                return $self->setup_fl2000dc("$path/fl2000dc");
+        } elsif ($envname eq "fl2003dc") {
+                return $self->setup_fl2003dc("$path/fl2003dc");
+        } elsif ($envname eq "fl2008r2dc") {
+                return $self->setup_fl2008r2dc("$path/fl2008r2dc");
+        } elsif ($envname eq "rpc_proxy") {
+                if (not defined($self->{vars}->{dc})) {
+                        $self->setup_dc("$path/dc");
+                }
+                return $self->setup_rpc_proxy("$path/rpc_proxy", $self->{vars}->{dc});
+        } elsif ($envname eq "vampire_dc") {
+                if (not defined($self->{vars}->{dc})) {
+                        $self->setup_dc("$path/dc");
+                }
+                return $self->setup_vampire_dc("$path/vampire_dc", $self->{vars}->{dc});
         } elsif ($envname eq "member") {
                 if (not defined($self->{vars}->{dc})) {
@@ -936 +1313 @@
                 }
                 return $self->setup_member("$path/member", $self->{vars}->{dc});
+        } elsif ($envname eq "rodc") {
+                if (not defined($self->{vars}->{dc})) {
+                        $self->setup_dc("$path/dc");
+                }
+                return $self->setup_rodc("$path/rodc", $self->{vars}->{dc});
+        } elsif ($envname eq "all") {
+                if (not defined($self->{vars}->{dc})) {
+                        $ENV{ENVNAME} = "dc";
+                        $self->setup_dc("$path/dc");
+                }
+                my $ret = $self->setup_member("$path/member", $self->{vars}->{dc});
+                if (not defined($self->{vars}->{rpc_proxy})) {
+                        $ENV{ENVNAME} = "rpc_proxy";
+                        my $rpc_proxy_ret = $self->setup_rpc_proxy("$path/rpc_proxy", $self->{vars}->{dc});
+                        
+                        $ret->{RPC_PROXY_SERVER} = $rpc_proxy_ret->{SERVER};
+                        $ret->{RPC_PROXY_SERVER_IP} = $rpc_proxy_ret->{SERVER_IP};
+                        $ret->{RPC_PROXY_NETBIOSNAME} = $rpc_proxy_ret->{NETBIOSNAME};
+                        $ret->{RPC_PROXY_NETBIOSALIAS} = $rpc_proxy_ret->{NETBIOSALIAS};
+                        $ret->{RPC_PROXY_USERNAME} = $rpc_proxy_ret->{USERNAME};
+                        $ret->{RPC_PROXY_PASSWORD} = $rpc_proxy_ret->{PASSWORD};
+                }
+                if (not defined($self->{vars}->{fl2000dc})) {
+                        $ENV{ENVNAME} = "fl2000dc";
+                        my $fl2000dc_ret = $self->setup_fl2000dc("$path/fl2000dc", $self->{vars}->{dc});
+                        
+                        $ret->{FL2000DC_SERVER} = $fl2000dc_ret->{SERVER};
+                        $ret->{FL2000DC_SERVER_IP} = $fl2000dc_ret->{SERVER_IP};
+                        $ret->{FL2000DC_NETBIOSNAME} = $fl2000dc_ret->{NETBIOSNAME};
+                        $ret->{FL2000DC_NETBIOSALIAS} = $fl2000dc_ret->{NETBIOSALIAS};
+                        $ret->{FL2000DC_USERNAME} = $fl2000dc_ret->{USERNAME};
+                        $ret->{FL2000DC_PASSWORD} = $fl2000dc_ret->{PASSWORD};
+                }
+                if (not defined($self->{vars}->{fl2003dc})) {
+                        $ENV{ENVNAME} = "fl2003dc";
+                        my $fl2003dc_ret = $self->setup_fl2003dc("$path/fl2003dc", $self->{vars}->{dc});
+
+                        $ret->{FL2003DC_SERVER} = $fl2003dc_ret->{SERVER};
+                        $ret->{FL2003DC_SERVER_IP} = $fl2003dc_ret->{SERVER_IP};
+                        $ret->{FL2003DC_NETBIOSNAME} = $fl2003dc_ret->{NETBIOSNAME};
+                        $ret->{FL2003DC_NETBIOSALIAS} = $fl2003dc_ret->{NETBIOSALIAS};
+                        $ret->{FL2003DC_USERNAME} = $fl2003dc_ret->{USERNAME};
+                        $ret->{FL2003DC_PASSWORD} = $fl2003dc_ret->{PASSWORD};
+                }
+                if (not defined($self->{vars}->{fl2008r2dc})) {
+                        $ENV{ENVNAME} = "fl2008r2dc";
+                        my $fl2008r2dc_ret = $self->setup_fl2008r2dc("$path/fl2008r2dc", $self->{vars}->{dc});
+
+                        $ret->{FL2008R2DC_SERVER} = $fl2008r2dc_ret->{SERVER};
+                        $ret->{FL2008R2DC_SERVER_IP} = $fl2008r2dc_ret->{SERVER_IP};
+                        $ret->{FL2008R2DC_NETBIOSNAME} = $fl2008r2dc_ret->{NETBIOSNAME};
+                        $ret->{FL2008R2DC_NETBIOSALIAS} = $fl2008r2dc_ret->{NETBIOSALIAS};
+                        $ret->{FL2008R2DC_USERNAME} = $fl2008r2dc_ret->{USERNAME};
+                        $ret->{FL2008R2DC_PASSWORD} = $fl2008r2dc_ret->{PASSWORD};
+                }
+                return $ret;
         } else {
-                die("Samba4 can't provide environment '$envname'");
-        }
-}
-
-sub setup_member($$$$)
+                warn("Samba4 can't provide environment '$envname'");
+                return undef;
+        }
+}
+
+sub setup_member($$$)
 {
         my ($self, $path, $dc_vars) = @_;
@@ -947 +1381 @@
         my $env = $self->provision_member($path, $dc_vars);
 
-        $self->check_or_start($env, ($ENV{SMBD_MAXTIME} or 7500));
+        if (defined $env) {
+                $self->check_or_start($env, ($ENV{SMBD_MAXTIME} or 7500));
+
+                $self->wait_for_start($env);
+
+                $self->{vars}->{member} = $env;
+        }
+
+        return $env;
+}
+
+sub setup_rpc_proxy($$$)
+{
+        my ($self, $path, $dc_vars) = @_;
+
+        my $env = $self->provision_rpc_proxy($path, $dc_vars);
+
+        if (defined $env) {
+                $self->check_or_start($env, ($ENV{SMBD_MAXTIME} or 7500));
+
+                $self->wait_for_start($env);
+
+                $self->{vars}->{rpc_proxy} = $env;
+        }
+        return $env;
+}
+
+sub setup_dc($$)
+{
+        my ($self, $path) = @_;
+
+        my $env = $self->provision_dc($path);
+        if (defined $env) {
+                $self->check_or_start($env,
+                        ($ENV{SMBD_MAXTIME} or 7500));
+
+                $self->wait_for_start($env);
+
+                $self->{vars}->{dc} = $env;
+        }
+        return $env;
+}
+
+sub setup_fl2000dc($$)
+{
+        my ($self, $path) = @_;
+
+        my $env = $self->provision_fl2000dc($path);
+        if (defined $env) {
+                $self->check_or_start($env,
+                        ($ENV{SMBD_MAXTIME} or 7500));
+
+                $self->wait_for_start($env);
+
+                $self->{vars}->{fl2000dc} = $env;
+        }
+
+        return $env;
+}
+
+sub setup_fl2003dc($$)
+{
+        my ($self, $path) = @_;
+
+        my $env = $self->provision_fl2003dc($path);
+
+        if (defined $env) {
+                $self->check_or_start($env,
+                        ($ENV{SMBD_MAXTIME} or 7500));
+
+                $self->wait_for_start($env);
+
+                $self->{vars}->{fl2003dc} = $env;
+        }
+        return $env;
+}
+
+sub setup_fl2008r2dc($$)
+{
+        my ($self, $path) = @_;
+
+        my $env = $self->provision_fl2008r2dc($path);
+
+        if (defined $env) {
+                $self->check_or_start($env,
+                        ($ENV{SMBD_MAXTIME} or 7500));
+
+                $self->wait_for_start($env);
+
+                $self->{vars}->{fl2008r2dc} = $env;
+        }
+
+        return $env;
+}
+
+sub setup_vampire_dc($$$)
+{
+        my ($self, $path, $dc_vars) = @_;
+
+        my $env = $self->provision_vampire_dc($path, $dc_vars);
+
+        if (defined $env) {
+                $self->check_or_start($env,
+                        ($ENV{SMBD_MAXTIME} or 7500));
+
+                $self->wait_for_start($env);
+
+                $self->{vars}->{vampire_dc} = $env;
+
+                # force replicated DC to update repsTo/repsFrom
+                # for vampired partitions
+                my $samba_tool = $self->bindir_path("samba-tool");
+                my $cmd = "";
+                $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\"";
+                $cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\"";
+                $cmd .= " $samba_tool drs kcc $env->{DC_SERVER}";
+                $cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}";
+                unless (system($cmd) == 0) {
+                        warn("Failed to exec kcc\n$cmd");
+                        return undef;
+                }
+
+                # as 'vampired' dc may add data in its local replica
+                # we need to synchronize data between DCs
+                my $base_dn = "DC=".join(",DC=", split(/\./, $dc_vars->{REALM}));
+                $cmd = "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\"";
+                $cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\"";
+                $cmd .= " $samba_tool drs replicate $env->{DC_SERVER} $env->{VAMPIRE_DC_SERVER}";
+                $cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}";
+                # replicate Configuration NC
+                my $cmd_repl = "$cmd \"CN=Configuration,$base_dn\"";
+                unless(system($cmd_repl) == 0) {
+                        warn("Failed to replicate\n$cmd_repl");
+                        return undef;
+                }
+                # replicate Default NC
+                $cmd_repl = "$cmd \"$base_dn\"";
+                unless(system($cmd_repl) == 0) {
+                        warn("Failed to replicate\n$cmd_repl");
+                        return undef;
+                }
+        }
+
+        return $env;
+}
+
+sub setup_rodc($$$)
+{
+        my ($self, $path, $dc_vars) = @_;
+
+        my $env = $self->provision_rodc($path, $dc_vars);
+
+        unless ($env) {
+                return undef;
+        }
+
+        $self->check_or_start($env,
+                ($ENV{SMBD_MAXTIME} or 7500));
 
         $self->wait_for_start($env);
 
+        $self->{vars}->{rodc} = $env;
+
         return $env;
 }
 
-sub setup_dc($$)
-{
-        my ($self, $path) = @_;
-
-        my $env = $self->provision_dc($path);
-
-        $self->check_or_start($env, 
-                ($ENV{SMBD_MAXTIME} or 7500));
-
-        $self->wait_for_start($env);
-
-        $self->{vars}->{dc} = $env;
-
-        return $env;
-}
-
-sub stop($)
-{
-        my ($self) = @_;
-}
-
 1;

trunk/server/selftest/target/Template.pm

@@ -45 +45 @@
 }
 
-sub stop($)
-{
-        my ($self) = @_;
-}
-
 1;

trunk/server/selftest/test_samba4.pl

@@ -7 +7 @@
 use Samba4;
 
-my $s = new Samba4($RealBin."/../source4/bin", undef, $RealBin."/../setup");
+my $s = new Samba4("bin", undef, $RealBin."/../setup");
 
 ok($s);
 
-is($RealBin."/../source4/bin", $s->{bindir});
+is("bin", $s->{bindir});
 
 ok($s->write_ldb_file("tmpldb", "