s4-selftest: support 'make testenv SCREEN=1'
[samba.git] / selftest / target / Samba4.pm
index 7833bf447956960689c89ef704e07314c4ee0db2..36023f21c75a21fca3dbc2c87969cad92c9ad2f8 100644 (file)
@@ -31,39 +31,32 @@ sub bindir_path($$) {
 }
 
 sub openldap_start($$$) {
-        my ($slapd_conf, $uri, $logs) = @_;
-       my $oldpath = $ENV{PATH};
-       my $olroot = "";
-       my $olpath = "";
-       if (defined $ENV{OPENLDAP_ROOT}) {
-           $olroot = "$ENV{OPENLDAP_ROOT}";
-           $olpath = "$olroot/libexec:$olroot/sbin:";
-       }
-       $ENV{PATH} = "$olpath/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}";
-        system("slapd -d0 -f $slapd_conf -h $uri > $logs 2>&1 &");
-        $ENV{PATH} = $oldpath;
 }
 
 sub slapd_start($$)
 {
        my $count = 0;
        my ($self, $env_vars) = @_;
+       my $ldbsearch = $self->bindir_path("ldbsearch");
 
        my $uri = $env_vars->{LDAP_URI};
 
+       if (system("$ldbsearch -H $uri -s base -b \"\" supportedLDAPVersion > /dev/null") == 0) {
+           print "A SLAPD is still listening to $uri before we started the LDAP backend.  Aborting!";
+           return 1;
+       }
        # running slapd in the background means it stays in the same process group, so it can be
        # killed by timelimit
        if ($self->{ldap} eq "fedora-ds") {
                system("$ENV{FEDORA_DS_ROOT}/sbin/ns-slapd -D $env_vars->{FEDORA_DS_DIR} -d0 -i $env_vars->{FEDORA_DS_PIDFILE}> $env_vars->{LDAPDIR}/logs 2>&1 &");
        } elsif ($self->{ldap} eq "openldap") {
-               openldap_start($env_vars->{SLAPD_CONF}, $uri, "$env_vars->{LDAPDIR}/logs");
+               system("$ENV{OPENLDAP_SLAPD} -d0 -F $env_vars->{SLAPD_CONF_D} -h $uri > $env_vars->{LDAPDIR}/logs 2>&1 &");
        }
-       my $ldbsearch = $self->bindir_path("ldbsearch");
        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);
        }
@@ -74,10 +67,12 @@ sub slapd_stop($$)
 {
        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);
        }
@@ -93,13 +88,16 @@ sub check_or_start($$$)
        POSIX::mkfifo($env_vars->{SAMBA_TEST_FIFO}, 0700);
        unlink($env_vars->{SAMBA_TEST_LOG});
        
-       print "STARTING SAMBA... ";
+       print "STARTING SAMBA for $ENV{ENVNAME}\n";
        my $pid = fork();
        if ($pid == 0) {
                open STDIN, $env_vars->{SAMBA_TEST_FIFO};
-               open STDOUT, ">$env_vars->{SAMBA_TEST_LOG}";
+               # we want out from samba to go to the log file, but also
+               # to the users terminal when running 'make test' on the command
+               # line. This puts it on stderr on the terminal
+               open STDOUT, "| tee $env_vars->{SAMBA_TEST_LOG} 1>&2";
                open STDERR, '>&STDOUT';
-               
+
                SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
 
                my $valgrind = "";
@@ -113,10 +111,14 @@ sub check_or_start($$$)
                $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
 
+               $ENV{UID_WRAPPER} = "1";
+
                # 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 (2nd time)");
+                       unless($self->slapd_start($env_vars)) {
+                               warn("couldn't start slapd (main run)");
+                               return undef;
+                       }
                }
 
                my $optarg = "";
@@ -127,21 +129,33 @@ sub check_or_start($$$)
                        $optarg.= " $ENV{SAMBA_OPTIONS}";
                }
                my $samba = $self->bindir_path("samba");
-               my $ret = system("$valgrind $samba $optarg $env_vars->{CONFIGURATION} -M single -i --leak-report-full");
-               if ($? == -1) {
+
+               # 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 ($ret == -1) {
                        print "Unable to start $samba: $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";
@@ -184,7 +198,7 @@ sub write_ldb_file($$$)
        my $ldbadd = $self->bindir_path("ldbadd");
        open(LDIF, "|$ldbadd -H $file >/dev/null");
        print LDIF $ldif;
-       return close(LDIF);
+       return(close(LDIF));
 }
 
 sub add_wins_config($$)
@@ -192,93 +206,36 @@ 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
 ");
 }
 
-sub mk_fedora_ds($$$)
+sub mk_fedora_ds($$)
 {
-       my ($self, $ldapdir, $configuration) = @_;
-
-       my $fedora_ds_inf = "$ldapdir/fedorads.inf";
-       my $fedora_ds_extra_ldif = "$ldapdir/fedorads-partitions.ldif";
+       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 $dir = getcwd();
-chdir "$ENV{FEDORA_DS_ROOT}/bin" || die;
-       if (system("perl $ENV{FEDORA_DS_ROOT}/sbin/setup-ds.pl --silent --file=$fedora_ds_inf >&2") != 0) {
-            chdir $dir;
-            die("perl $ENV{FEDORA_DS_ROOT}/sbin/setup-ds.pl --silent --file=$fedora_ds_inf FAILED: $?");
-        }
-        chdir $dir || die;
+       my $pidfile = "$fedora_ds_dir/logs/slapd-$ctx->{ldap_instance}.pid";
 
        return ($fedora_ds_dir, $pidfile);
 }
 
-sub mk_openldap($$$)
+sub mk_openldap($$)
 {
-       my ($self, $ldapdir, $configuration) = @_;
-
-       my $slapd_conf = "$ldapdir/slapd.conf";
-       my $pidfile = "$ldapdir/slapd.pid";
-       my $modconf = "$ldapdir/modules.conf";
-
-       my $oldpath = $ENV{PATH};
-       my $olpath = "";
-       my $olroot = "";
-       if (defined $ENV{OPENLDAP_ROOT}) {
-               $olroot = "$ENV{OPENLDAP_ROOT}";
-              $olpath = "$olroot/libexec:$olroot/sbin:";
-       }
-       $ENV{PATH} = "$olpath/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}";
-
-       unlink($modconf);
-
-       #This code tries to guess what modules we need to load (if any) by trying different combinations in the modules.conf
-
-       # Try without any slapd modules
-       open(CONF, ">$modconf"); close(CONF);
-
-       if (system("slaptest -u -f $slapd_conf >&2") != 0) {
-               open(CONF, ">$modconf"); 
-               # enable slapd modules
-               print CONF "
-moduleload     syncprov
-moduleload      memberof
-moduleload      refint
-moduleload      deref
-";
-               close(CONF);
-       }
-       if (system("slaptest -u -f $slapd_conf >&2") != 0) {
-               open(CONF, ">$modconf"); 
-               # enable slapd modules, and the module for back_hdb
-               print CONF "
-moduleload     back_hdb
-moduleload     syncprov
-moduleload      memberof
-moduleload      refint
-moduleload      deref
-";
-               close(CONF);
-       }
-
-       system("slaptest -u -f $slapd_conf") == 0 or die("slaptest still fails after adding modules");
+       my ($self, $ctx) = @_;
 
-    
-       $ENV{PATH} = $oldpath;
+       my $slapd_conf_d = "$ctx->{ldapdir}/slapd.d";
+       my $pidfile = "$ctx->{ldapdir}/slapd.pid";
 
-       return ($slapd_conf, $pidfile);
+       return ($slapd_conf_d, $pidfile);
 }
 
 sub mk_keyblobs($$)
@@ -295,6 +252,7 @@ sub mk_keyblobs($$)
        my $adminkeyfile = "$tlsdir/adminkey.pem";
        my $reqadmin = "$tlsdir/req-admin.der";
        my $admincertfile = "$tlsdir/admincert.pem";
+       my $admincertupnfile = "$tlsdir/admincertupn.pem";
 
        mkdir($tlsdir, 0777);
 
@@ -442,44 +400,78 @@ EOF
        open(ADMINCERTFILE, ">$admincertfile");
        print ADMINCERTFILE <<EOF;
 -----BEGIN CERTIFICATE-----
-MIIDHTCCAoagAwIBAgIUC0W5dW/N9kE+NgD0mKK34YgyqQ0wCwYJKoZIhvcNAQEFMFIxEzAR
+MIIDHTCCAoagAwIBAgIUUggzW4lLRkMKe1DAR2NKatkMDYwwCwYJKoZIhvcNAQELMFIxEzAR
 BgoJkiaJk/IsZAEZDANjb20xFzAVBgoJkiaJk/IsZAEZDAdleGFtcGxlMRUwEwYKCZImiZPy
-LGQBGQwFc2FtYmExCzAJBgNVBAMMAkNBMCIYDzIwMDgwMzAxMTMyMzAwWhgPMjAzMzAyMjQx
-MzIzMDBaMG0xEzARBgoJkiaJk/IsZAEZDANjb20xFzAVBgoJkiaJk/IsZAEZDAdleGFtcGxl
+LGQBGQwFc2FtYmExCzAJBgNVBAMMAkNBMCIYDzIwMDkwNzI3MDMzMjE1WhgPMjAzNDA3MjIw
+MzMyMTVaMG0xEzARBgoJkiaJk/IsZAEZDANjb20xFzAVBgoJkiaJk/IsZAEZDAdleGFtcGxl
 MRUwEwYKCZImiZPyLGQBGQwFc2FtYmExDjAMBgNVBAMMBXVzZXJzMRYwFAYDVQQDDA1BZG1p
 bmlzdHJhdG9yMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD0+OL7TQBj0RejbIH1+g5G
 eRaWaM9xF43uE5y7jUHEsi5owhZF5iIoHZeeL6cpDF5y1BZRs0JlA1VqMry1jjKlzFYVEMMF
 xB6esnXhl0Jpip1JkUMMXLOP1m/0dqayuHBWozj9f/cdyCJr0wJIX1Z8Pr+EjYRGPn/MF0xd
 l3JRlwIDAQABo4HSMIHPMA4GA1UdDwEB/wQEAwIFoDAoBgNVHSUEITAfBgcrBgEFAgMEBggr
 BgEFBQcDAgYKKwYBBAGCNxQCAjBIBgNVHREEQTA/oD0GBisGAQUCAqAzMDGgExsRU0FNQkEu
-RVhBTVBMRS5DT02hGjAYoAMCAQGhETAPGw1hZG1pbmlzdHJhdG9yMB8GA1UdIwQYMBaAFMLZ
+RVhBTVBMRS5DT02hGjAYoAMCAQGhETAPGw1BZG1pbmlzdHJhdG9yMB8GA1UdIwQYMBaAFMLZ
 ufegDKLZs0VOyFXYK1L6M8oyMB0GA1UdDgQWBBQg81bLyfCA88C2B/BDjXlGuaFaxjAJBgNV
-HRMEAjAAMA0GCSqGSIb3DQEBBQUAA4GBAHsqSqul0hZCXn4t8Kfp3v/JLMiUMJihR1XOgzoa
-ufLOQ1HNzFUHKuo1JEQ1+i5gHT/arLu/ZBF4BfQol7vW27gKIEt0fkRV8EvoPxXvSokHq0Ku
-HCuPOhYNEP3wYiwB3g93NMCinWVlz0mh5aijEU7y/XrjlZxBKFFrTE+BJi1o
+HRMEAjAAMA0GCSqGSIb3DQEBCwUAA4GBAEf/OSHUDJaGdtWGNuJeqcVYVMwrfBAc0OSwVhz1
+7/xqKHWo8wIMPkYRtaRHKLNDsF8GkhQPCpVsa6mX/Nt7YQnNvwd+1SBP5E8GvwWw9ZzLJvma
+nk2n89emuayLpVtp00PymrDLRBcNaRjFReQU8f0o509kiVPHduAp3jOiy13l
 -----END CERTIFICATE-----
 EOF
        close(ADMINCERTFILE);
+
+       # hxtool issue-certificate --ca-certificate=FILE:$CAFILE,$KEYFILE \
+       # --type="pkinit-client" \
+       # --ms-upn="administrator@samba.example.com" \
+       # --req="PKCS10:$ADMINREQFILE" --certificate="FILE:$ADMINCERTUPNFILE" \
+       # --lifetime="25 years"
+       
+       open(ADMINCERTUPNFILE, ">$admincertupnfile");
+       print ADMINCERTUPNFILE <<EOF;
+-----BEGIN CERTIFICATE-----
+MIIDDzCCAnigAwIBAgIUUp3CJMuNaEaAdPKp3QdNIwG7a4wwCwYJKoZIhvcNAQELMFIxEzAR
+BgoJkiaJk/IsZAEZDANjb20xFzAVBgoJkiaJk/IsZAEZDAdleGFtcGxlMRUwEwYKCZImiZPy
+LGQBGQwFc2FtYmExCzAJBgNVBAMMAkNBMCIYDzIwMDkwNzI3MDMzMzA1WhgPMjAzNDA3MjIw
+MzMzMDVaMG0xEzARBgoJkiaJk/IsZAEZDANjb20xFzAVBgoJkiaJk/IsZAEZDAdleGFtcGxl
+MRUwEwYKCZImiZPyLGQBGQwFc2FtYmExDjAMBgNVBAMMBXVzZXJzMRYwFAYDVQQDDA1BZG1p
+bmlzdHJhdG9yMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD0+OL7TQBj0RejbIH1+g5G
+eRaWaM9xF43uE5y7jUHEsi5owhZF5iIoHZeeL6cpDF5y1BZRs0JlA1VqMry1jjKlzFYVEMMF
+xB6esnXhl0Jpip1JkUMMXLOP1m/0dqayuHBWozj9f/cdyCJr0wJIX1Z8Pr+EjYRGPn/MF0xd
+l3JRlwIDAQABo4HEMIHBMA4GA1UdDwEB/wQEAwIFoDAoBgNVHSUEITAfBgcrBgEFAgMEBggr
+BgEFBQcDAgYKKwYBBAGCNxQCAjA6BgNVHREEMzAxoC8GCisGAQQBgjcUAgOgIQwfYWRtaW5p
+c3RyYXRvckBzYW1iYS5leGFtcGxlLmNvbTAfBgNVHSMEGDAWgBTC2bn3oAyi2bNFTshV2CtS
++jPKMjAdBgNVHQ4EFgQUIPNWy8nwgPPAtgfwQ415RrmhWsYwCQYDVR0TBAIwADANBgkqhkiG
+9w0BAQsFAAOBgQBk42+egeUB3Ji2PC55fbt3FNKxvmm2xUUFkV9POK/YR9rajKOwk5jtYSeS
+Zd7J9s//rNFNa7waklFkDaY56+QWTFtdvxfE+KoHaqt6X8u6pqi7p3M4wDKQox+9Dx8yWFyq
+Wfz/8alZ5aMezCQzXJyIaJsCLeKABosSwHcpAFmxlQ==
+-----END CERTIFICATE-----
+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, $netbiosname, $netbiosalias, 
+           $domain, $realm, $functional_level,
+           $swiface, $password, $kdc_ipv4) = @_;
        my $ctx;
 
-       -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;
+       
+       $ctx->{dns_host_file} = "$ENV{SELFTEST_PREFIX}/dns_host_file";
+
        $ctx->{server_role} = $server_role;
        $ctx->{netbiosname} = $netbiosname;
        $ctx->{netbiosalias} = $netbiosalias;
@@ -489,10 +481,12 @@ sub provision_raw_prepare($$$$$$$)
 
        $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";
+       $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;
@@ -519,9 +513,6 @@ sub provision_raw_prepare($$$$$$$)
        $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});
@@ -554,14 +545,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
 #
@@ -571,12 +561,15 @@ 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;
+       }
        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}
@@ -589,7 +582,7 @@ sub provision_raw_step1($$)
        winbindd privileged socket directory = $ctx->{winbindd_privileged_socket_dir}
        ntp signd socket directory = $ctx->{ntp_signd_socket_dir}
        winbind separator = /
-       name resolve order = bcast
+       name resolve order = file bcast
        interfaces = $ctx->{interfaces}
        tls dh params file = $ctx->{tlsdir}/dhparms.pem
        panic action = $RealBin/gdb_backtrace \%PID% \%PROG%
@@ -601,6 +594,19 @@ sub provision_raw_step1($$)
        gensec:require_pac = true
        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
+        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}
@@ -610,8 +616,10 @@ sub provision_raw_step1($$)
 
        $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}
 
@@ -673,13 +681,17 @@ 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 = $self->bindir_path("../scripting/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!");
+               warn("Failed to create a valid smb.conf configuration $testparm!");
+               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");
+       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 = {
                KRB5_CONFIG => $ctx->{krb5_conf},
@@ -693,6 +705,7 @@ nogroup:x:65534:nobody
                REALM => $ctx->{realm},
                PASSWORD => $ctx->{password},
                LDAPDIR => $ctx->{ldapdir},
+               LDAP_INSTANCE => $ctx->{ldap_instance},
                WINBINDD_SOCKET_DIR => $ctx->{winbindd_socket_dir},
                NCALRPCDIR => $ctx->{ncalrpcdir},
                LOCKDIR => $ctx->{lockdir},
@@ -709,8 +722,6 @@ nogroup:x:65534:nobody
        return $ret;
 }
 
-#
-# provision_raw_step2() is also used by Samba34.pm!
 #
 # Step2 runs the provision script
 #
@@ -719,55 +730,59 @@ 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) = @_;
+       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);
 
        $ctx->{tmpdir} = "$ctx->{prefix_abs}/tmp";
        push(@{$ctx->{directories}}, "$ctx->{tmpdir}");
        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
-       ntvfs handler = posix
-       posix:sharedelay = 100000
-       posix:eadb = $ctx->{lockdir}/eadb.tdb
+       posix:sharedelay = 10000
        posix:oplocktimeout = 3
        posix:writetimeupdatedelay = 500000
 
 [test1]
        path = $ctx->{tmpdir}/test1
        read only = no
-       ntvfs handler = posix
-       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
-       ntvfs handler = posix
-       posix:sharedelay = 100000
-       posix:eadb = $ctx->{lockdir}/eadb.tdb
+       posix:sharedelay = 10000
        posix:oplocktimeout = 3
-       posix:writetimeupdatedelay = 500000
+       posix:writetimeupdatedelay = 50000
 
 [cifs]
        read only = no
@@ -803,75 +818,191 @@ sub provision($$$$$$$)
                $ldap_uri =~ s|/|%2F|g;
                $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 ($ret) {
+               return undef;
+       }
 
        if (defined($self->{ldap})) {
-               my $configuration = "--configfile=$ctx->{smb_conf}";
-
                $ret->{LDAP_URI} = $ctx->{ldap_uri};
-               push (@{$ctx->{provision_options}},"--ldap-backend=$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) or die("Unable to create openldap directories");
 
-               system("$self->{setupdir}/provision-backend $configuration --ldap-admin-pass=$ctx->{password} --root=$ctx->{unix_name} --realm=$ctx->{realm} --domain=$ctx->{domain} --host-name=$ctx->{netbiosname} --ldap-backend-type=$self->{ldap}>&2") == 0 or die("backend provision failed");
+                } 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) or die("Unable to create fedora ds directories");
+               }
 
-               push (@{$ctx->{provision_options}}, "--password=$ctx->{password}");
+       }
 
-               if ($self->{ldap} eq "openldap") {
-                       push (@{$ctx->{provision_options}}, "--username=samba-admin");
-                       push (@{$ctx->{provision_options}}, "--ldap-backend-type=openldap");
+       return $self->provision_raw_step2($ctx, $ret);
+}
 
-                       ($ret->{SLAPD_CONF}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ctx->{ldapdir}, $configuration) or die("Unable to create openldap directories");
+sub provision_member($$$)
+{
+       my ($self, $prefix, $dcvars) = @_;
+       print "PROVISIONING MEMBER...";
 
-               } elsif ($self->{ldap} eq "fedora-ds") {
-                       push (@{$ctx->{provision_options}}, "--simple-bind-dn=cn=Manager,$ctx->{localbasedn}");
-                       push (@{$ctx->{provision_options}}, "--ldap-backend-type=fedora-ds");
+       my $ret = $self->provision($prefix,
+                                  "member server",
+                                  "localmember",
+                                  "member3",
+                                  "SAMBADOMAIN", 
+                                  "samba.example.com", 
+                                  "2008",
+                                  3,
+                                  "locMEMpass3",
+                                  $dcvars->{SERVER_IP},
+                                  "");
+       unless ($ret) {
+               return undef;
+       }
 
-                       ($ret->{FEDORA_DS_DIR}, $ret->{FEDORA_DS_PIDFILE}) = $self->mk_fedora_ds($ctx->{ldapdir}, $configuration) or die("Unable to create fedora ds directories");
-               }
+       my $net = $self->bindir_path("net");
+       my $cmd = "";
+       $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+       $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
+       $cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{REALM} member";
+       $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
 
-               $self->slapd_start($ret) or die("couldn't start slapd");
+       unless (system($cmd) == 0) {
+               warn("Join failed\n$cmd");
+               return undef;
        }
 
-       $ret = $self->provision_raw_step2($ctx, $ret);
+       $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};
 
-       if (defined($self->{ldap})) {
-               $self->slapd_stop($ret) or die("couldn't stop slapd");
-       }
+       $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_member($$$)
+sub provision_rpc_proxy($$$)
 {
        my ($self, $prefix, $dcvars) = @_;
-       print "PROVISIONING MEMBER...";
+       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",
-                                  "localmember3",
-                                  "localmember",
-                                  3,
-                                  "localmemberpass",
-                                  $dcvars->{SERVER_IP});
+                                  "localrpcproxy",
+                                  "rpcproxy4",
+                                  "SAMBADOMAIN", 
+                                  "samba.example.com", 
+                                  "2008",
+                                  4,
+                                  "locRPCproxypass4",
+                                  $dcvars->{SERVER_IP},
+                                  $extra_smbconf_options);
+
+       unless ($ret) {
+               return undef;
+       }
 
-       $ret or die("Unable to provision");
+       my $net = $self->bindir_path("net");
+       my $cmd = "";
+       $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+       $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
+       $cmd .= "$net 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 $net = $self->bindir_path("net");
        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}";
+       $cmd .= "$net vampire $ret->{CONFIGURATION} $dcvars->{REALM} --realm=$dcvars->{REALM}";
+       $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->{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->{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};
+       $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;
 }
@@ -883,14 +1014,174 @@ sub provision_dc($$)
        print "PROVISIONING DC...";
        my $ret = $self->provision($prefix,
                                   "domain controller",
-                                  "localdc1",
                                   "localdc",
+                                  "dc1",
+                                  "SAMBADOMAIN", 
+                                  "samba.example.com", 
+                                  "2008",
                                   1,
-                                  "localdcpass",
-                                  "127.0.0.1");
+                                  "locDCpass1",
+                                  "127.0.0.1", "");
+
+       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) = @_;
 
-       $self->add_wins_config("$prefix/private") or 
-               die("Unable to add wins configuration");
+       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 $net = $self->bindir_path("net");
+       my $cmd = "";
+       $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+       $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
+       $cmd .= "$net 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;
+       }
+
+       $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;
 }
@@ -902,8 +1193,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);
 
@@ -911,16 +1201,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;
                }
        }
 
@@ -957,30 +1247,101 @@ 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) = @_;
 
+       $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})) {
                        $self->setup_dc("$path/dc");
                }
                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'");
+               warn("Samba4 can't provide environment '$envname'");
+               return undef;
        }
 }
 
-sub setup_member($$$$)
+sub setup_member($$$)
 {
        my ($self, $path, $dc_vars) = @_;
 
@@ -990,6 +1351,23 @@ sub setup_member($$$$)
 
        $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);
+
+       $self->check_or_start($env, ($ENV{SMBD_MAXTIME} or 7500));
+
+       $self->wait_for_start($env);
+
+       $self->{vars}->{rpc_proxy} = $env;
+
        return $env;
 }
 
@@ -1009,9 +1387,121 @@ sub setup_dc($$)
        return $env;
 }
 
-sub stop($)
+sub setup_fl2000dc($$)
+{
+       my ($self, $path) = @_;
+
+       my $env = $self->provision_fl2000dc($path);
+
+       $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);
+
+       $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);
+
+       $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);
+
+       $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 $net = $self->bindir_path("net");
+       my $cmd = "";
+       $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\"";
+       $cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\"";
+       $cmd .= " $net 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 .= " $net 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) = @_;
+       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;
 }
 
 1;