Changeset 745 for trunk/server/selftest/target

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/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)

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;