selftest: add test for subdomain support
[ira/wip.git] / selftest / target / Samba4.pm
index 343834cb453eb3033fc2f6e9127e78da36a0fe0b..ff8f5ee84bf294d3aad1a5b1e54debf2213e8760 100644 (file)
@@ -9,25 +9,31 @@ use strict;
 use Cwd qw(abs_path);
 use FindBin qw($RealBin);
 use POSIX;
+use SocketWrapper;
+use target::Samba;
+use target::Samba3;
 
 sub new($$$$$) {
-       my ($classname, $bindir, $ldap, $setupdir, $exeext) = @_;
+       my ($classname, $bindir, $binary_mapping, $ldap, $srcdir, $exeext, $server_maxtime) = @_;
        $exeext = "" unless defined($exeext);
-       my $self = { 
-               vars => {}, 
-               ldap => $ldap, 
-               bindir => $bindir, 
-               setupdir => $setupdir,
-               exeext => $exeext
+
+       my $self = {
+               vars => {},
+               ldap => $ldap,
+               bindir => $bindir,
+               binary_mapping => $binary_mapping,
+               srcdir => $srcdir,
+               exeext => $exeext,
+               server_maxtime => $server_maxtime,
+               target3 => new Samba3($bindir, $binary_mapping, $srcdir, $exeext, $server_maxtime)
        };
        bless $self;
        return $self;
 }
 
-sub bindir_path($$) {
+sub scriptdir_path($$) {
        my ($self, $path) = @_;
-
-       return "$self->{bindir}/$path$self->{exeext}";
+       return "$self->{srcdir}/source4/scripting/$path";
 }
 
 sub openldap_start($$$) {
@@ -37,7 +43,7 @@ sub slapd_start($$)
 {
        my $count = 0;
        my ($self, $env_vars) = @_;
-       my $ldbsearch = $self->bindir_path("ldbsearch");
+       my $ldbsearch = Samba::bindir_path($self, "ldbsearch");
 
        my $uri = $env_vars->{LDAP_URI};
 
@@ -53,10 +59,10 @@ sub slapd_start($$)
                system("$ENV{OPENLDAP_SLAPD} -d0 -F $env_vars->{SLAPD_CONF_D} -h $uri > $env_vars->{LDAPDIR}/logs 2>&1 &");
        }
        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);
        }
@@ -69,24 +75,27 @@ sub slapd_stop($$)
        if ($self->{ldap} eq "fedora-ds") {
                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);
        }
        return 1;
 }
 
-sub check_or_start($$$) 
+sub check_or_start($$$)
 {
-       my ($self, $env_vars, $max_time) = @_;
+       my ($self, $env_vars, $process_model) = @_;
        return 0 if ( -p $env_vars->{SAMBA_TEST_FIFO});
 
        unlink($env_vars->{SAMBA_TEST_FIFO});
        POSIX::mkfifo($env_vars->{SAMBA_TEST_FIFO}, 0700);
        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) {
                open STDIN, $env_vars->{SAMBA_TEST_FIFO};
@@ -101,9 +110,9 @@ sub check_or_start($$$)
                my $valgrind = "";
                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};
 
                $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
@@ -113,42 +122,39 @@ sub check_or_start($$$)
 
                # 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;
+                       }
                }
 
                my $optarg = "";
-               if (defined($max_time)) {
-                       $optarg = "--maximum-runtime=$max_time ";
-               }
+               $optarg = "--maximum-runtime=$self->{server_maxtime}";
                if (defined($ENV{SAMBA_OPTIONS})) {
                        $optarg.= " $ENV{SAMBA_OPTIONS}";
                }
-               my $samba = $self->bindir_path("samba");
-
-               # allow selection of the process model using
-               # the environment varibale SAMBA_PROCESS_MODEL
-               # that allows us to change the process model for 
-               # individual machines in the build farm
-               my $model = "single";
-               if (defined($ENV{SAMBA_PROCESS_MODEL})) {
-                       $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";
+               my $samba =  Samba::bindir_path($self, "samba");
+
+               chomp($pwd);
+               my $cmdline = "$valgrind ${pwd}/$samba $optarg $env_vars->{CONFIGURATION} -M $process_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;
        }
        print "DONE\n";
@@ -165,21 +171,21 @@ sub wait_for_start($$)
        print "delaying for nbt name registration\n";
        sleep 2;
 
-       # 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");
+       # This will return quickly when things are up, but be slow if we
+       # need to wait for (eg) SSL init
+       my $nmblookup =  Samba::bindir_path($self, "nmblookup");
        system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{SERVER}");
        system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{SERVER}");
        system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{NETBIOSNAME}");
        system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{NETBIOSNAME}");
-       system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{NETBIOSALIAS}");
-       system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{NETBIOSALIAS}");
+       system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{NETBIOSNAME}");
+       system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{NETBIOSNAME}");
        system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{SERVER}");
        system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{SERVER}");
        system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{NETBIOSNAME}");
        system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{NETBIOSNAME}");
-       system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{NETBIOSALIAS}");
-       system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{NETBIOSALIAS}");
+       system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{NETBIOSNAME}");
+       system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{NETBIOSNAME}");
 
        print $self->getlog_env($testenv_vars);
 }
@@ -188,10 +194,10 @@ sub write_ldb_file($$$)
 {
        my ($self, $file, $ldif) = @_;
 
-       my $ldbadd = $self->bindir_path("ldbadd");
+       my $ldbadd =  Samba::bindir_path($self, "ldbadd");
        open(LDIF, "|$ldbadd -H $file >/dev/null");
        print LDIF $ldif;
-       return close(LDIF);
+       return(close(LDIF));
 }
 
 sub add_wins_config($$)
@@ -199,10 +205,10 @@ sub add_wins_config($$)
        my ($self, $privatedir) = @_;
 
        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
 type: 0x3
@@ -260,7 +266,7 @@ YX70obsCAQI=
 EOF
        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");
        print KEYFILE <<EOF;
@@ -302,7 +308,7 @@ yoZeAErTALjyZYZEPcECQQDlUi0N8DFxQ/lOwWyR3Hailft+mPqoPCa8QHlQZnlG
 -----END RSA PRIVATE KEY-----
 EOF
 
-       #generated with 
+       #generated with
        # hxtool issue-certificate --self-signed --issue-ca \
        # --ca-private-key="FILE:$KEYFILE" \
        # --subject="CN=CA,DC=samba,DC=example,DC=com" \
@@ -326,7 +332,7 @@ HTLk2sGigsWwrJ2N99sG/cqSJLJ1MFwLrs6koweBnYU0f/g=
 -----END CERTIFICATE-----
 EOF
 
-       #generated with GNUTLS internally in Samba.  
+       #generated with GNUTLS internally in Samba.
 
        open(CERTFILE, ">$certfile");
        print CERTFILE <<EOF;
@@ -440,21 +446,26 @@ Wfz/8alZ5aMezCQzXJyIaJsCLeKABosSwHcpAFmxlQ==
 EOF
 }
 
-#
-# provision_raw_prepare() is also used by Samba34.pm!
-#
-sub provision_raw_prepare($$$$$$$)
+sub provision_raw_prepare($$$$$$$$$$)
 {
-       my ($self, $prefix, $server_role, $netbiosname, $netbiosalias, $swiface, $password, $kdc_ipv4) = @_;
+       my ($self, $prefix, $server_role, $hostname,
+           $domain, $realm, $functional_level,
+           $swiface, $password, $kdc_ipv4) = @_;
        my $ctx;
+       my $netbiosname = uc($hostname);
 
-       -d $prefix or mkdir($prefix, 0777) or die("Unable to create $prefix");
+       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 "/";
 
-       (system("rm -rf $prefix_abs/*") == 0) or die("Unable to clean up");
+       unless (system("rm -rf $prefix_abs/*") == 0) {
+               warn("Unable to clean up");
+       }
 
        $ctx->{prefix} = $prefix;
        $ctx->{prefix_abs} = $prefix_abs;
@@ -462,19 +473,21 @@ sub provision_raw_prepare($$$$$$$)
        $ctx->{dns_host_file} = "$ENV{SELFTEST_PREFIX}/dns_host_file";
 
        $ctx->{server_role} = $server_role;
+       $ctx->{hostname} = $hostname;
        $ctx->{netbiosname} = $netbiosname;
-       $ctx->{netbiosalias} = $netbiosalias;
        $ctx->{swiface} = $swiface;
        $ctx->{password} = $password;
        $ctx->{kdc_ipv4} = $kdc_ipv4;
 
-       $ctx->{server_loglevel} = 1;
+       $ctx->{server_loglevel} =$ENV{SERVER_LOG_LEVEL} || 1;
        $ctx->{username} = "Administrator";
-       $ctx->{domain} = "SAMBADOMAIN";
-       $ctx->{realm} = "SAMBA.EXAMPLE.COM";
-       $ctx->{dnsname} = lc($ctx->{realm});
+       $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;
@@ -489,6 +502,8 @@ sub provision_raw_prepare($$$$$$$)
        $ctx->{privatedir} = "$prefix_abs/private";
        $ctx->{ncalrpcdir} = "$prefix_abs/ncalrpc";
        $ctx->{lockdir} = "$prefix_abs/lockdir";
+       $ctx->{statedir} = "$prefix_abs/statedir";
+       $ctx->{cachedir} = "$prefix_abs/cachedir";
        $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";
@@ -503,8 +518,9 @@ sub provision_raw_prepare($$$$$$$)
        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});
+       push(@{$ctx->{directories}}, $ctx->{statedir});
+       push(@{$ctx->{directories}}, $ctx->{cachedir});
 
        $ctx->{smb_conf_extra_options} = "";
 
@@ -513,16 +529,24 @@ sub provision_raw_prepare($$$$$$$)
        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->{setupdir}/provision");
+       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-name=$ctx->{hostname}");
        push (@provision_options, "--host-ip=$ctx->{ipv4}");
        push (@provision_options, "--quiet");
        push (@provision_options, "--domain=$ctx->{domain}");
@@ -532,14 +556,13 @@ sub provision_raw_prepare($$$$$$$)
        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;
 }
 
-#
-# provision_raw_step1() is also used by Samba34.pm!
 #
 # Step1 creates the basic configuration
 #
@@ -549,31 +572,36 @@ sub provision_raw_step1($$)
 
        mkdir($_, 0777) foreach (@{$ctx->{directories}});
 
-       open(CONFFILE, ">$ctx->{smb_conf}")
-               or die("can't open $ctx->{smb_conf}$?");
+       unless (open(CONFFILE, ">$ctx->{smb_conf}")) {
+               warn("can't open $ctx->{smb_conf}$?");
+               return undef;
+       }
+       my $acl = "false";
+       $acl = "true" if (defined $ENV{WITH_ACL});
        print CONFFILE "
 [global]
+       acl:search = $acl
        netbios name = $ctx->{netbiosname}
-       netbios aliases = $ctx->{netbiosalias}
-       posix:eadb = $ctx->{lockdir}/eadb.tdb
+       posix:eadb = $ctx->{statedir}/eadb.tdb
        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
+       state directory = $ctx->{statedir}
+       cache directory = $ctx->{cachedir}
        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 file
+       name resolve order = file bcast
        interfaces = $ctx->{interfaces}
        tls dh params file = $ctx->{tlsdir}/dhparms.pem
-       panic action = $RealBin/gdb_backtrace \%PID% \%PROG%
+       panic action = $RealBin/gdb_backtrace \%d
        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
@@ -581,15 +609,18 @@ sub provision_raw_step1($$)
        log level = $ctx->{server_loglevel}
        lanman auth = Yes
        rndc command = true
-        dns update command = $ENV{SRCDIR_ABS}/scripting/bin/samba_dnsupdate --all-interfaces --use-file=$ctx->{dns_host_file}
-        spn update command = $ENV{SRCDIR_ABS}/scripting/bin/samba_spnupdate
+        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
+
+        passdb backend = samba4
 ";
 
        if (defined($ctx->{sid_generator}) && $ctx->{sid_generator} ne "internal") {
                print CONFFILE "
        sid generator = $ctx->{sid_generator}";
-        }
+       }
 
        print CONFFILE "
 
@@ -601,47 +632,12 @@ sub provision_raw_step1($$)
 
        $self->mk_keyblobs($ctx->{tlsdir});
 
-       open(KRB5CONF, ">$ctx->{krb5_conf}")
-               or die("can't open $ctx->{krb5_conf}$?");
-       print KRB5CONF "
-#Generated krb5.conf for $ctx->{realm}
-
-[libdefaults]
- default_realm = $ctx->{realm}
- dns_lookup_realm = false
- dns_lookup_kdc = false
- ticket_lifetime = 24h
- forwardable = yes
-
-[realms]
- $ctx->{realm} = {
-  kdc = $ctx->{kdc_ipv4}:88
-  admin_server = $ctx->{kdc_ipv4}:88
-  default_domain = $ctx->{dnsname}
- }
- $ctx->{dnsname} = {
-  kdc = $ctx->{kdc_ipv4}:88
-  admin_server = $ctx->{kdc_ipv4}:88
-  default_domain = $ctx->{dnsname}
- }
- $ctx->{domain} = {
-  kdc = $ctx->{kdc_ipv4}:88
-  admin_server = $ctx->{kdc_ipv4}:88
-  default_domain = $ctx->{dnsname}
- }
-
-[appdefaults]
-       pkinit_anchors = FILE:$ctx->{tlsdir}/ca.pem
-
-[kdc]
-       enable-pkinit = true
-       pkinit_identity = FILE:$ctx->{tlsdir}/kdc.pem,$ctx->{tlsdir}/key.pem
-       pkinit_anchors = FILE:$ctx->{tlsdir}/ca.pem
-
-[domain_realm]
- .$ctx->{dnsname} = $ctx->{realm}
-";
-       close(KRB5CONF);
+        #Default the KDC IP to the server's IP
+       if (not defined($ctx->{kdc_ipv4})) {
+             $ctx->{kdc_ipv4} = $ctx->{ipv4};
+        }
+
+       Samba::mk_krb5_conf($ctx, "");
 
        open(PWD, ">$ctx->{nsswrap_passwd}");
        print PWD "
@@ -664,21 +660,23 @@ nogroup:x:65534:nobody
        my $configuration = "--configfile=$ctx->{smb_conf}";
 
 #Ensure the config file is valid before we start
-       my $testparm = $self->bindir_path("testparm");
+       my $testparm = Samba::bindir_path($self, "samba-tool") . " 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!");
+               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;
        }
-
-       (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");
 
        my $ret = {
                KRB5_CONFIG => $ctx->{krb5_conf},
                PIDDIR => $ctx->{piddir},
-               SERVER => $ctx->{netbiosname},
+               SERVER => $ctx->{hostname},
                SERVER_IP => $ctx->{ipv4},
                NETBIOSNAME => $ctx->{netbiosname},
-               NETBIOSALIAS => $ctx->{netbiosalias},
                DOMAIN => $ctx->{domain},
                USERNAME => $ctx->{username},
                REALM => $ctx->{realm},
@@ -688,6 +686,8 @@ nogroup:x:65534:nobody
                WINBINDD_SOCKET_DIR => $ctx->{winbindd_socket_dir},
                NCALRPCDIR => $ctx->{ncalrpcdir},
                LOCKDIR => $ctx->{lockdir},
+               STATEDIR => $ctx->{statedir},
+               CACHEDIR => $ctx->{cachedir},
                SERVERCONFFILE => $ctx->{smb_conf},
                CONFIGURATION => $configuration,
                SOCKET_WRAPPER_DEFAULT_IFACE => $ctx->{swiface},
@@ -701,8 +701,6 @@ nogroup:x:65534:nobody
        return $ret;
 }
 
-#
-# provision_raw_step2() is also used by Samba34.pm!
 #
 # Step2 runs the provision script
 #
@@ -711,17 +709,23 @@ sub provision_raw_step2($$$)
        my ($self, $ctx, $ret) = @_;
 
        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($$$$$$$)
+sub provision($$$$$$$$$)
 {
-       my ($self, $prefix, $server_role, $netbiosname, $netbiosalias, $swiface, $password, $kdc_ipv4, $extra_smbconf_options) = @_;
+       my ($self, $prefix, $server_role, $hostname,
+           $domain, $realm, $functional_level,
+           $swiface, $password, $kdc_ipv4, $extra_smbconf_options) = @_;
 
        my $ctx = $self->provision_raw_prepare($prefix, $server_role,
-                                              $netbiosname, $netbiosalias,
+                                              $hostname,
+                                              $domain, $realm, $functional_level,
                                               $swiface, $password, $kdc_ipv4);
 
        $ctx->{tmpdir} = "$ctx->{prefix_abs}/tmp";
@@ -734,8 +738,10 @@ sub provision($$$$$$$)
 
        max xmit = 32K
        server max protocol = SMB2
-        $extra_smbconf_options
        host msdfs = $msdfs
+       lanman auth = yes
+
+       $extra_smbconf_options
 
 [tmp]
        path = $ctx->{tmpdir}
@@ -763,8 +769,10 @@ sub provision($$$$$$$)
        ntvfs handler = cifs
        cifs:server = $ctx->{netbiosname}
        cifs:share = tmp
-#There is no username specified here, instead the client is expected
-#to log in with kerberos, and the serverwill use delegated credentials.
+       cifs:use-s4u2proxy = yes
+       # There is no username specified here, instead the client is expected
+       # to log in with kerberos, and the serverwill use delegated credentials.
+       # Or the server tries s4u2self/s4u2proxy to impersonate the client
 
 [simple]
        path = $ctx->{tmpdir}
@@ -772,11 +780,11 @@ sub provision($$$$$$$)
        ntvfs handler = simple
 
 [sysvol]
-       path = $ctx->{lockdir}/sysvol
+       path = $ctx->{statedir}/sysvol
        read only = yes
 
 [netlogon]
-       path = $ctx->{lockdir}/sysvol/$ctx->{dnsname}/scripts
+       path = $ctx->{statedir}/sysvol/$ctx->{dnsname}/scripts
        read only = no
 
 [cifsposix]
@@ -792,8 +800,7 @@ sub provision($$$$$$$)
                $ldap_uri =~ s|/|%2F|g;
                $ldap_uri = "ldapi://$ldap_uri";
                $ctx->{ldap_uri} = $ldap_uri;
-
-                if ($self->{ldap} eq "fedora-ds") {
+               if ($self->{ldap} eq "fedora-ds") {
                        $ctx->{sid_generator} = "backend";
                }
 
@@ -801,13 +808,16 @@ sub provision($$$$$$$)
        }
 
        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});
+                       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") {
@@ -818,9 +828,7 @@ sub provision($$$$$$$)
 
        }
 
-       $ret = $self->provision_raw_step2($ctx, $ret);
-
-       return $ret;
+       return $self->provision_raw_step2($ctx, $ret);
 }
 
 sub provision_member($$$)
@@ -830,35 +838,39 @@ sub provision_member($$$)
 
        my $ret = $self->provision($prefix,
                                   "member server",
-                                  "localmember3",
-                                  "localmember",
-                                  3,
-                                  "locMEMpass0",
+                                  "s4member",
+                                  "SAMBADOMAIN",
+                                  "samba.example.com",
+                                  "2008",
+                                  23,
+                                  "locMEMpass3",
                                   $dcvars->{SERVER_IP},
                                   "");
+       unless ($ret) {
+               return undef;
+       }
 
-       $ret or die("Unable to provision");
-
-       my $net = $self->bindir_path("net");
+       my $samba_tool =  Samba::bindir_path($self, "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 .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} member";
        $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
 
-       system($cmd) == 0 or die("Join failed\n$cmd");
+       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};
 
@@ -870,38 +882,210 @@ sub provision_rpc_proxy($$$)
        my ($self, $prefix, $dcvars) = @_;
        print "PROVISIONING RPC PROXY...";
 
-       my $extra_smbconf_options = "dcerpc_remote:binding = ncacn_ip_tcp:localdc1
-       dcerpc endpoint servers = epmapper, remote
-       dcerpc_remote:interfaces = rpcecho
+       my $extra_smbconf_options = "
+
+       # rpc_proxy
+       dcerpc_remote:binding = ncacn_ip_tcp:$dcvars->{SERVER}
+       dcerpc endpoint servers = epmapper, remote
+       dcerpc_remote:interfaces = rpcecho
+
+[cifs_to_dc]
+       read only = no
+       ntvfs handler = cifs
+       cifs:server = $dcvars->{SERVER}
+       cifs:share = cifs
+       cifs:use-s4u2proxy = yes
+       # There is no username specified here, instead the client is expected
+       # to log in with kerberos, and the serverwill use delegated credentials.
+       # Or the server tries s4u2self/s4u2proxy to impersonate the client
+
 ";
 
        my $ret = $self->provision($prefix,
                                   "member server",
-                                  "localrpcproxy4",
                                   "localrpcproxy",
-                                  4,
-                                  "locRPCproxypass0",
+                                  "SAMBADOMAIN",
+                                  "samba.example.com",
+                                  "2008",
+                                  24,
+                                  "locRPCproxypass4",
                                   $dcvars->{SERVER_IP},
                                   $extra_smbconf_options);
 
-       $ret or die("Unable to provision");
+       unless ($ret) {
+               return undef;
+       }
+
+       my $samba_tool =  Samba::bindir_path($self, "samba-tool");
 
-       my $net = $self->bindir_path("net");
+       # The joind runs in the context of the rpc_proxy/member for now
        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 .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} member";
        $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
 
-       system($cmd) == 0 or die("Join failed\n$cmd");
+       unless (system($cmd) == 0) {
+               warn("Join failed\n$cmd");
+               return undef;
+       }
+
+       # Setting up delegation runs in the context of the DC for now
+       $cmd = "";
+       $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$dcvars->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+       $cmd .= "KRB5_CONFIG=\"$dcvars->{KRB5_CONFIG}\" ";
+       $cmd .= "$samba_tool delegation for-any-protocol '$ret->{NETBIOSNAME}\$' on";
+       $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD} $dcvars->{CONFIGURATION}";
+
+       unless (system($cmd) == 0) {
+               warn("Delegation failed\n$cmd");
+               return undef;
+       }
+
+       # Setting up delegation runs in the context of the DC for now
+       $cmd = "";
+       $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$dcvars->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+       $cmd .= "KRB5_CONFIG=\"$dcvars->{KRB5_CONFIG}\" ";
+       $cmd .= "$samba_tool delegation add-service '$ret->{NETBIOSNAME}\$' cifs/$dcvars->{SERVER}";
+       $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD} $dcvars->{CONFIGURATION}";
+
+       unless (system($cmd) == 0) {
+               warn("Delegation 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};
 
+       $ret->{DC_SERVER} = $dcvars->{DC_SERVER};
+       $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP};
+       $ret->{DC_NETBIOSNAME} = $dcvars->{DC_NETBIOSNAME};
+       $ret->{DC_USERNAME} = $dcvars->{DC_USERNAME};
+       $ret->{DC_PASSWORD} = $dcvars->{DC_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",
+                                              "SAMBADOMAIN",
+                                              "samba.example.com",
+                                              "2008",
+                                              22, $dcvars->{PASSWORD},
+                                              $dcvars->{SERVER_IP});
+
+       $ctx->{smb_conf_extra_options} = "
+       max xmit = 32K
+       server max protocol = SMB2
+
+[sysvol]
+       path = $ctx->{statedir}/sysvol
+       read only = yes
+
+[netlogon]
+       path = $ctx->{statedir}/sysvol/$ctx->{dnsname}/scripts
+       read only = no
+
+";
+
+       my $ret = $self->provision_raw_step1($ctx);
+       unless ($ret) {
+               return undef;
+       }
+
+       my $samba_tool =  Samba::bindir_path($self, "samba-tool");
+       my $cmd = "";
+       $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+       $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
+       $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} DC --realm=$dcvars->{REALM}";
+       $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD} --domain-critical-only";
+
+       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->{DC_SERVER} = $dcvars->{DC_SERVER};
+       $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP};
+       $ret->{DC_NETBIOSNAME} = $dcvars->{DC_NETBIOSNAME};
+       $ret->{DC_USERNAME} = $dcvars->{DC_USERNAME};
+       $ret->{DC_PASSWORD} = $dcvars->{DC_PASSWORD};
+
+       return $ret;
+}
+
+sub provision_subdom_dc($$$)
+{
+       my ($self, $prefix, $dcvars) = @_;
+       print "PROVISIONING SUBDOMAIN 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",
+                                              "localsubdc",
+                                              "SAMBASUBDOM",
+                                              "sub.samba.example.com",
+                                              "2008",
+                                              31, $dcvars->{PASSWORD},
+                                              undef);
+
+       $ctx->{smb_conf_extra_options} = "
+       max xmit = 32K
+       server max protocol = SMB2
+
+[sysvol]
+       path = $ctx->{statedir}/sysvol
+       read only = yes
+
+[netlogon]
+       path = $ctx->{statedir}/sysvol/$ctx->{dnsname}/scripts
+       read only = no
+
+";
+
+       my $ret = $self->provision_raw_step1($ctx);
+       unless ($ret) {
+               return undef;
+       }
+
+        my $dc_realms = Samba::mk_realms_stanza($dcvars->{REALM}, lc($dcvars->{REALM}),
+                                                $dcvars->{DOMAIN}, $dcvars->{SERVER_IP});
+       Samba::mk_krb5_conf($ctx, $dc_realms);
+
+       my $samba_tool =  Samba::bindir_path($self, "samba-tool");
+       my $cmd = "";
+       $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+       $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
+       $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $ctx->{realm} subdomain ";
+       $cmd .= "--parent-domain=$dcvars->{REALM} -U$dcvars->{DC_USERNAME}\@$dcvars->{REALM}\%$dcvars->{DC_PASSWORD}";
+
+       unless (system($cmd) == 0) {
+               warn("Join failed\n$cmd");
+               return undef;
+       }
+
+       $ret->{SUBDOM_DC_SERVER} = $ret->{SERVER};
+       $ret->{SUBDOM_DC_SERVER_IP} = $ret->{SERVER_IP};
+       $ret->{SUBDOM_DC_NETBIOSNAME} = $ret->{NETBIOSNAME};
+
+       $ret->{DC_SERVER} = $dcvars->{DC_SERVER};
+       $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP};
+       $ret->{DC_NETBIOSNAME} = $dcvars->{DC_NETBIOSNAME};
+       $ret->{DC_USERNAME} = $dcvars->{DC_USERNAME};
+       $ret->{DC_PASSWORD} = $dcvars->{DC_PASSWORD};
+
        return $ret;
 }
 
@@ -912,19 +1096,206 @@ sub provision_dc($$)
        print "PROVISIONING DC...";
        my $ret = $self->provision($prefix,
                                   "domain controller",
-                                  "localdc1",
                                   "localdc",
-                                  1,
-                                  "locDCpass0",
-                                  "127.0.0.1", "");
+                                  "SAMBADOMAIN",
+                                  "samba.example.com",
+                                  "2008",
+                                  21,
+                                  "locDCpass1",
+                                  undef, "netbios aliases = DC1");
+
+       return undef unless(defined $ret);
+       unless($self->add_wins_config("$prefix/private")) {
+               warn("Unable to add wins configuration");
+               return undef;
+       }
+
+       $ret->{NETBIOSALIAS} = "DC1";
+       $ret->{DC_SERVER} = $ret->{SERVER};
+       $ret->{DC_SERVER_IP} = $ret->{SERVER_IP};
+       $ret->{DC_NETBIOSNAME} = $ret->{NETBIOSNAME};
+       $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",
+                                  "SAMBA2000",
+                                  "samba2000.example.com",
+                                  "2000",
+                                  25,
+                                  "locDCpass5",
+                                  undef, "");
+
+       unless($self->add_wins_config("$prefix/private")) {
+               warn("Unable to add wins configuration");
+               return undef;
+       }
+
+       return $ret;
+}
 
-       $self->add_wins_config("$prefix/private") or 
-               die("Unable to add wins configuration");
+sub provision_fl2003dc($$)
+{
+       my ($self, $prefix) = @_;
+
+       print "PROVISIONING DC...";
+       my $ret = $self->provision($prefix,
+                                  "domain controller",
+                                  "dc6",
+                                  "SAMBA2003",
+                                  "samba2003.example.com",
+                                  "2003",
+                                  26,
+                                  "locDCpass6",
+                                  undef, "");
+
+       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",
+                                  "SAMBA2008R2",
+                                  "samba2008R2.example.com",
+                                  "2008_R2",
+                                  27,
+                                  "locDCpass7",
+                                  undef, "");
+
+       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",
+                                              "SAMBADOMAIN",
+                                              "samba.example.com",
+                                              "2008",
+                                              28, $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->{statedir}/sysvol
+       read only = yes
+
+[netlogon]
+       path = $ctx->{statedir}/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 =  Samba::bindir_path($self, "samba-tool");
+       my $cmd = "";
+       $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+       $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
+       $cmd .= "$samba_tool domain 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};
+       Samba::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->{DC_SERVER} = $dcvars->{DC_SERVER};
+       $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP};
+       $ret->{DC_NETBIOSNAME} = $dcvars->{DC_NETBIOSNAME};
+       $ret->{DC_USERNAME} = $dcvars->{DC_USERNAME};
+       $ret->{DC_PASSWORD} = $dcvars->{DC_PASSWORD};
+
+       return $ret;
+}
+
+sub provision_plugin_s4_dc($$)
+{
+       my ($self, $prefix) = @_;
+
+       my $extra_smbconf_options = "
+server services = -smb
+";
+
+       print "PROVISIONING PLUGIN S4 DC...";
+       my $ret = $self->provision($prefix,
+                                  "domain controller",
+                                  "plugindc",
+                                  "PLUGINDOMAIN",
+                                  "plugin.samba.example.com",
+                                  "2008",
+                                  30,
+                                  "locDCpass1",
+                                  undef, $extra_smbconf_options);
+
+       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};
 
@@ -938,8 +1309,7 @@ sub teardown_env($$)
 
        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);
 
@@ -947,16 +1317,16 @@ sub teardown_env($$)
                # this time to write out the covarge data
                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;
                }
        }
 
@@ -985,7 +1355,7 @@ sub getlog_env($$)
        close(LOG);
 
        return "" if $out eq $title;
+
        return $out;
 }
 
@@ -993,77 +1363,150 @@ sub check_env($$)
 {
        my ($self, $envvars) = @_;
 
-       return 1 if (-p $envvars->{SAMBA_TEST_FIFO});
-
-       print $self->getlog_env($envvars);
-
-       return 0;
+       return (-p $envvars->{SAMBA_TEST_FIFO});
 }
 
 sub setup_env($$$)
 {
        my ($self, $envname, $path) = @_;
+       my $target3 = $self->{target3};
+
+       $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 "member") {
+       } 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 "subdom_dc") {
                if (not defined($self->{vars}->{dc})) {
                        $self->setup_dc("$path/dc");
                }
-               return $self->setup_member("$path/member", $self->{vars}->{dc});
+               return $self->setup_subdom_dc("$path/subdom_dc", $self->{vars}->{dc});
+       } elsif ($envname eq "s4member") {
+               if (not defined($self->{vars}->{dc})) {
+                       $self->setup_dc("$path/dc");
+               }
+               return $self->setup_member("$path/s4member", $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 "s3member") {
+               if (not defined($self->{vars}->{dc})) {
+                       $self->setup_dc("$path/dc");
+               }
+               return $target3->setup_admember("$path/s3member", $self->{vars}->{dc}, 29);
+       } elsif ($envname eq "plugin_s4_dc") {
+               return $self->setup_plugin_s4_dc("$path/plugin_s4_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});
+               my $ret = $self->setup_member("$path/s4member", $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_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_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_USERNAME} = $fl2008r2dc_ret->{USERNAME};
+                       $ret->{FL2008R2DC_PASSWORD} = $fl2008r2dc_ret->{PASSWORD};
+               }
+               if (not defined($self->{vars}->{s3member})) {
+                       $ENV{ENVNAME} = "s3member";
+                       my $s3member_ret = $target3->setup_admember("$path/s3member", $self->{vars}->{dc}, 29);
+                       $self->{vars}->{s3member} = $s3member_ret;
+
+                       $ret->{S3MEMBER_SERVER} = $s3member_ret->{SERVER};
+                       $ret->{S3MEMBER_SERVER_IP} = $s3member_ret->{SERVER_IP};
+                       $ret->{S3MEMBER_NETBIOSNAME} = $s3member_ret->{NETBIOSNAME};
+                       $ret->{S3MEMBER_NETBIOSALIAS} = $s3member_ret->{NETBIOSALIAS};
+                       $ret->{S3MEMBER_USERNAME} = $s3member_ret->{USERNAME};
+                       $ret->{S3MEMBER_PASSWORD} = $s3member_ret->{PASSWORD};
+               }
                return $ret;
        } else {
-               die("Samba4 can't provide environment '$envname'");
+               return undef;
        }
 }
 
-sub setup_member($$$$)
+sub setup_member($$$)
 {
        my ($self, $path, $dc_vars) = @_;
 
        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, "single");
 
-       $self->wait_for_start($env);
+               $self->wait_for_start($env);
 
-       $self->{vars}->{member} = $env;
+               $self->{vars}->{member} = $env;
+       }
 
        return $env;
 }
 
-sub setup_rpc_proxy($$$$)
+sub setup_rpc_proxy($$$)
 {
        my ($self, $path, $dc_vars) = @_;
 
        my $env = $self->provision_rpc_proxy($path, $dc_vars);
 
-       $self->check_or_start($env, ($ENV{SMBD_MAXTIME} or 7500));
+       if (defined $env) {
+               $self->check_or_start($env, "single");
 
-       $self->wait_for_start($env);
-
-       $self->{vars}->{rpc_proxy} = $env;
+               $self->wait_for_start($env);
 
+               $self->{vars}->{rpc_proxy} = $env;
+       }
        return $env;
 }
 
@@ -1072,20 +1515,207 @@ sub setup_dc($$)
        my ($self, $path) = @_;
 
        my $env = $self->provision_dc($path);
+       if (defined $env) {
+               $self->check_or_start($env, "standard");
+
+               $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, "single");
+
+               $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, "single");
+
+               $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, "single");
+
+               $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);
 
-       $self->check_or_start($env, 
-               ($ENV{SMBD_MAXTIME} or 7500));
+       if (defined $env) {
+               $self->check_or_start($env, "single");
+
+               $self->wait_for_start($env);
+
+               $self->{vars}->{vampire_dc} = $env;
+
+               # force replicated DC to update repsTo/repsFrom
+               # for vampired partitions
+               my $samba_tool =  Samba::bindir_path($self, "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 .= " $env->{CONFIGURATION}";
+               $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 .= " $dc_vars->{CONFIGURATION}";
+               $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_subdom_dc($$$)
+{
+       my ($self, $path, $dc_vars) = @_;
+
+       my $env = $self->provision_subdom_dc($path, $dc_vars);
+
+       if (defined $env) {
+               $self->check_or_start($env, "single");
+
+               $self->wait_for_start($env);
+
+               $self->{vars}->{subdom_dc} = $env;
+
+               # force replicated DC to update repsTo/repsFrom
+               # for primary domain partitions
+               my $samba_tool =  Samba::bindir_path($self, "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 .= " $env->{CONFIGURATION}";
+               $cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}";
+               unless (system($cmd) == 0) {
+                       warn("Failed to exec kcc\n$cmd");
+                       return undef;
+               }
+
+               # as 'subdomain' dc may add data in its local replica
+               # we need to synchronize data between DCs
+               my $base_dn = "DC=".join(",DC=", split(/\./, $env->{REALM}));
+               my $config_dn = "CN=Configuration,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->{SUBDOM_DC_SERVER}";
+               $cmd .= " $dc_vars->{CONFIGURATION}";
+               $cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}";
+               # replicate Configuration NC
+               my $cmd_repl = "$cmd \"$config_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, "single");
 
        $self->wait_for_start($env);
 
-       $self->{vars}->{dc} = $env;
+       $self->{vars}->{rodc} = $env;
 
        return $env;
 }
 
-sub stop($)
+sub setup_plugin_s4_dc($$)
 {
-       my ($self) = @_;
+       my ($self, $path) = @_;
+
+       my $env = $self->provision_plugin_s4_dc($path);
+       if (defined $env) {
+               $self->check_or_start($env, "single");
+
+               $self->wait_for_start($env);
+
+               my $s3_part_env = $self->{target3}->setup_plugin_s4_dc($path, $env, 30);
+               if (not defined($s3_part_env)) {
+                   return undef;
+               }
+
+               $self->{vars}->{plugin_s4_dc} = $s3_part_env;
+       }
+       return $env;
 }
 
 1;