vfs_shadow_copy2: add tests for snapsharepath
[obnox/samba/samba-obnox.git] / selftest / target / Samba3.pm
old mode 100644 (file)
new mode 100755 (executable)
index d2082f5..44dadfb
@@ -9,24 +9,51 @@ use strict;
 use Cwd qw(abs_path);
 use FindBin qw($RealBin);
 use POSIX;
+use target::Samba;
+
+sub have_ads($) {
+        my ($self) = @_;
+       my $found_ads = 0;
+        my $smbd_build_options = Samba::bindir_path($self, "smbd") . " -b|";
+        open(IN, $smbd_build_options) or die("Unable to run $smbd_build_options: $!");
+
+        while (<IN>) {
+                if (/WITH_ADS/) {
+                       $found_ads = 1;
+                }
+        }
+       close IN;
+
+       # If we were not built with ADS support, pretend we were never even available
+       print "smbd does not have ADS support\n" unless $found_ads;
+       return $found_ads;
+}
 
-sub binpath($$)
+# return smb.conf parameters applicable to @path, based on the underlying
+# filesystem type
+sub get_fs_specific_conf($$)
 {
-       my ($self, $binary) = @_;
+       my ($self, $path) = @_;
+       my $mods = "";
+       my $stat_out = `stat --file-system $path` or return "";
+
+       if ($stat_out =~ m/Type:\s+btrfs/) {
+               $mods .= "btrfs ";
+       }
 
-       if (defined($self->{bindir})) {
-               my $path = "$self->{bindir}/$binary";
-               -f $path or die("File $path doesn't exist");
-               return $path;
+       if ($mods) {
+               return "vfs objects = $mods";
        }
 
-       return $binary;
+       return undef;
 }
 
 sub new($$) {
-       my ($classname, $bindir, $srcdir) = @_;
-       my $self = { bindir => $bindir,
-                    srcdir => $srcdir
+       my ($classname, $bindir, $srcdir, $server_maxtime) = @_;
+       my $self = { vars => {},
+                    bindir => $bindir,
+                    srcdir => $srcdir,
+                    server_maxtime => $server_maxtime
        };
        bless $self;
        return $self;
@@ -35,17 +62,56 @@ sub new($$) {
 sub teardown_env($$)
 {
        my ($self, $envvars) = @_;
+       my $count = 0;
 
-       my $smbdpid = read_pid($envvars, "smbd");
-       my $nmbdpid = read_pid($envvars, "nmbd");
-       my $winbinddpid = read_pid($envvars, "winbindd");
+       # This should cause smbd to terminate gracefully
+       close($envvars->{STDIN_PIPE});
+
+       my $smbdpid = $envvars->{SMBD_TL_PID};
+       my $nmbdpid = $envvars->{NMBD_TL_PID};
+       my $winbinddpid = $envvars->{WINBINDD_TL_PID};
+
+       # This should give it time to write out the gcov data
+       until ($count > 20) {
+           my $smbdchild = Samba::cleanup_child($smbdpid, "smbd");
+           my $nmbdchild = Samba::cleanup_child($nmbdpid, "nmbd");
+           my $winbinddchild = Samba::cleanup_child($winbinddpid, "winbindd");
+           if ($smbdchild == -1
+               && $nmbdchild == -1
+               && $winbinddchild == -1) {
+               last;
+           }
+           sleep(1);
+           $count++;
+       }
+
+       if ($count <= 20 && kill(0, $smbdpid, $nmbdpid, $winbinddpid) == 0) {
+           return;
+       }
 
        $self->stop_sig_term($smbdpid);
        $self->stop_sig_term($nmbdpid);
        $self->stop_sig_term($winbinddpid);
 
-       sleep(2);
+       $count = 0;
+       until ($count > 10) {
+           my $smbdchild = Samba::cleanup_child($smbdpid, "smbd");
+           my $nmbdchild = Samba::cleanup_child($nmbdpid, "nmbd");
+           my $winbinddchild = Samba::cleanup_child($winbinddpid, "winbindd");
+           if ($smbdchild == -1
+               && $nmbdchild == -1
+               && $winbinddchild == -1) {
+               last;
+           }
+           sleep(1);
+           $count++;
+       }
 
+       if ($count <= 10 && kill(0, $smbdpid, $nmbdpid, $winbinddpid) == 0) {
+           return;
+       }
+
+       warn("timelimit process did not quit on SIGTERM, sending SIGKILL");
        $self->stop_sig_kill($smbdpid);
        $self->stop_sig_kill($nmbdpid);
        $self->stop_sig_kill($winbinddpid);
@@ -90,6 +156,8 @@ sub check_env($$)
 {
        my ($self, $envvars) = @_;
 
+       my $childpid = waitpid(-1, WNOHANG);
+
        # TODO ...
        return 1;
 }
@@ -97,185 +165,541 @@ sub check_env($$)
 sub setup_env($$$)
 {
        my ($self, $envname, $path) = @_;
-       
-       if ($envname eq "dc") {
-               return $self->setup_dc("$path/dc");
-       } elsif ($envname eq "secshare") {
-               return $self->setup_secshare("$path/secshare");
+
+       $ENV{ENVNAME} = $envname;
+
+       if (defined($self->{vars}->{$envname})) {
+               return $self->{vars}->{$envname};
+       }
+
+       #
+       # Avoid hitting system krb5.conf -
+       # An env that needs Kerberos will reset this to the real
+       # value.
+       #
+       $ENV{KRB5_CONFIG} = "$path/no_krb5.conf";
+
+       if ($envname eq "nt4_dc") {
+               return $self->setup_nt4_dc("$path/nt4_dc");
+       } elsif ($envname eq "nt4_dc_schannel") {
+               return $self->setup_nt4_dc_schannel("$path/nt4_dc_schannel");
+       } elsif ($envname eq "simpleserver") {
+               return $self->setup_simpleserver("$path/simpleserver");
+       } elsif ($envname eq "fileserver") {
+               return $self->setup_fileserver("$path/fileserver");
+       } elsif ($envname eq "maptoguest") {
+               return $self->setup_maptoguest("$path/maptoguest");
        } elsif ($envname eq "ktest") {
                return $self->setup_ktest("$path/ktest");
-       } elsif ($envname eq "secserver") {
-               if (not defined($self->{vars}->{dc})) {
-                       if (not defined($self->setup_dc("$path/dc"))) {
-                               return undef;
-                       }
-               }
-               return $self->setup_secserver("$path/secserver", $self->{vars}->{dc});
-       } elsif ($envname eq "member") {
-               if (not defined($self->{vars}->{dc})) {
-                       if (not defined($self->setup_dc("$path/dc"))) {
+       } elsif ($envname eq "nt4_member") {
+               if (not defined($self->{vars}->{nt4_dc})) {
+                       if (not defined($self->setup_nt4_dc("$path/nt4_dc"))) {
                                return undef;
                        }
                }
-               return $self->setup_member("$path/member", $self->{vars}->{dc});
+               return $self->setup_nt4_member("$path/nt4_member", $self->{vars}->{nt4_dc});
        } else {
-               return undef;
+               return "UNKNOWN";
        }
 }
 
-sub setup_dc($$)
+sub setup_nt4_dc($$)
 {
        my ($self, $path) = @_;
 
-       print "PROVISIONING DC...";
+       print "PROVISIONING NT4 DC...";
 
-       my $dc_options = "
+       my $nt4_dc_options = "
        domain master = yes
        domain logons = yes
        lanman auth = yes
+
+       rpc_server:epmapper = external
+       rpc_server:spoolss = external
+       rpc_server:lsarpc = external
+       rpc_server:samr = external
+       rpc_server:netlogon = external
+       rpc_server:register_embedded_np = yes
+       rpc_server:FssagentRpc = external
+
+       rpc_daemon:epmd = fork
+       rpc_daemon:spoolssd = fork
+       rpc_daemon:lsasd = fork
+       rpc_daemon:fssd = fork
+       fss: sequence timeout = 1
 ";
 
        my $vars = $self->provision($path,
-                                   "LOCALDC2",
-                                   2,
-                                   "localdc2pass",
-                                   $dc_options);
+                                   "LOCALNT4DC2",
+                                   "localntdc2pass",
+                                   $nt4_dc_options);
 
        $vars or return undef;
 
-       $self->check_or_start($vars,
-                             ($ENV{SMBD_MAXTIME} or 2700),
-                              "yes", "yes", "yes");
+       if (not $self->check_or_start($vars, "yes", "yes", "yes")) {
+              return undef;
+       }
+
+       $vars->{DC_SERVER} = $vars->{SERVER};
+       $vars->{DC_SERVER_IP} = $vars->{SERVER_IP};
+       $vars->{DC_SERVER_IPV6} = $vars->{SERVER_IPV6};
+       $vars->{DC_NETBIOSNAME} = $vars->{NETBIOSNAME};
+       $vars->{DC_USERNAME} = $vars->{USERNAME};
+       $vars->{DC_PASSWORD} = $vars->{PASSWORD};
+
+       $self->{vars}->{nt4_dc} = $vars;
+
+       return $vars;
+}
+
+sub setup_nt4_dc_schannel($$)
+{
+       my ($self, $path) = @_;
+
+       print "PROVISIONING NT4 DC WITH SERVER SCHANNEL ...";
+
+       my $pdc_options = "
+       domain master = yes
+       domain logons = yes
+       lanman auth = yes
+
+       rpc_server:epmapper = external
+       rpc_server:spoolss = external
+       rpc_server:lsarpc = external
+       rpc_server:samr = external
+       rpc_server:netlogon = external
+       rpc_server:register_embedded_np = yes
+
+       rpc_daemon:epmd = fork
+       rpc_daemon:spoolssd = fork
+       rpc_daemon:lsasd = fork
 
-       if (not $self->wait_for_start($vars)) {
+       server schannel = yes
+";
+
+       my $vars = $self->provision($path,
+                                   "LOCALNT4DC9",
+                                   "localntdc9pass",
+                                   $pdc_options);
+
+       $vars or return undef;
+
+       if (not $self->check_or_start($vars, "yes", "yes", "yes")) {
               return undef;
        }
 
        $vars->{DC_SERVER} = $vars->{SERVER};
        $vars->{DC_SERVER_IP} = $vars->{SERVER_IP};
+       $vars->{DC_SERVER_IPV6} = $vars->{SERVER_IPV6};
        $vars->{DC_NETBIOSNAME} = $vars->{NETBIOSNAME};
        $vars->{DC_USERNAME} = $vars->{USERNAME};
        $vars->{DC_PASSWORD} = $vars->{PASSWORD};
 
-       $self->{vars}->{dc} = $vars;
+       $self->{vars}->{nt4_dc_schannel} = $vars;
 
        return $vars;
 }
 
-sub setup_member($$$)
+sub setup_nt4_member($$$)
 {
-       my ($self, $prefix, $dcvars) = @_;
+       my ($self, $prefix, $nt4_dc_vars) = @_;
+       my $count = 0;
+       my $rc;
 
        print "PROVISIONING MEMBER...";
 
        my $member_options = "
        security = domain
        server signing = on
+       dbwrap_tdb_mutexes:* = yes
 ";
        my $ret = $self->provision($prefix,
-                                  "LOCALMEMBER3",
-                                  3,
-                                  "localmember3pass",
+                                  "LOCALNT4MEMBER3",
+                                  "localnt4member3pass",
                                   $member_options);
 
        $ret or return undef;
 
-       my $net = $self->binpath("net");
+       my $nmblookup = Samba::bindir_path($self, "nmblookup");
+       do {
+               print "Waiting for the LOGON SERVER registration ...\n";
+               $rc = system("$nmblookup $ret->{CONFIGURATION} $ret->{DOMAIN}\#1c");
+               if ($rc != 0) {
+                       sleep(1);
+               }
+               $count++;
+       } while ($rc != 0 && $count < 10);
+       if ($count == 10) {
+               print "NMBD not reachable after 10 retries\n";
+               teardown_env($self, $ret);
+               return 0;
+       }
+
+       my $net = Samba::bindir_path($self, "net");
        my $cmd = "";
        $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
-       $cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{DOMAIN} member";
+       $cmd .= "$net join $ret->{CONFIGURATION} $nt4_dc_vars->{DOMAIN} member";
+       $cmd .= " -U$nt4_dc_vars->{USERNAME}\%$nt4_dc_vars->{PASSWORD}";
+
+       if (system($cmd) != 0) {
+           warn("Join failed\n$cmd");
+           return undef;
+       }
+
+       if (not $self->check_or_start($ret, "yes", "yes", "yes")) {
+              return undef;
+       }
+
+       $ret->{DC_SERVER} = $nt4_dc_vars->{SERVER};
+       $ret->{DC_SERVER_IP} = $nt4_dc_vars->{SERVER_IP};
+       $ret->{DC_SERVER_IPV6} = $nt4_dc_vars->{SERVER_IPV6};
+       $ret->{DC_NETBIOSNAME} = $nt4_dc_vars->{NETBIOSNAME};
+       $ret->{DC_USERNAME} = $nt4_dc_vars->{USERNAME};
+       $ret->{DC_PASSWORD} = $nt4_dc_vars->{PASSWORD};
+
+       return $ret;
+}
+
+sub setup_admember($$$$)
+{
+       my ($self, $prefix, $dcvars) = @_;
+
+       # If we didn't build with ADS, pretend this env was never available
+       if (not $self->have_ads()) {
+               return "UNKNOWN";
+       }
+
+       print "PROVISIONING S3 AD MEMBER...";
+
+       my $member_options = "
+       security = ads
+       server signing = on
+        workgroup = $dcvars->{DOMAIN}
+        realm = $dcvars->{REALM}
+";
+
+       my $ret = $self->provision($prefix,
+                                  "LOCALADMEMBER",
+                                  "loCalMemberPass",
+                                  $member_options,
+                                  $dcvars->{SERVER_IP},
+                                  $dcvars->{SERVER_IPV6});
+
+       $ret or return undef;
+
+       close(USERMAP);
+       $ret->{DOMAIN} = $dcvars->{DOMAIN};
+       $ret->{REALM} = $dcvars->{REALM};
+
+       my $ctx;
+       my $prefix_abs = abs_path($prefix);
+       $ctx = {};
+       $ctx->{krb5_conf} = "$prefix_abs/lib/krb5.conf";
+       $ctx->{domain} = $dcvars->{DOMAIN};
+       $ctx->{realm} = $dcvars->{REALM};
+       $ctx->{dnsname} = lc($dcvars->{REALM});
+       $ctx->{kdc_ipv4} = $dcvars->{SERVER_IP};
+       $ctx->{kdc_ipv6} = $dcvars->{SERVER_IPV6};
+       Samba::mk_krb5_conf($ctx, "");
+
+       $ret->{KRB5_CONFIG} = $ctx->{krb5_conf};
+
+       my $net = Samba::bindir_path($self, "net");
+       my $cmd = "";
+       $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+       if (defined($ret->{RESOLV_WRAPPER_CONF})) {
+               $cmd .= "RESOLV_WRAPPER_CONF=\"$ret->{RESOLV_WRAPPER_CONF}\" ";
+       } else {
+               $cmd .= "RESOLV_WRAPPER_HOSTS=\"$ret->{RESOLV_WRAPPER_HOSTS}\" ";
+       }
+       $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
+       $cmd .= "$net join $ret->{CONFIGURATION}";
        $cmd .= " -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}";
 
-       system($cmd) == 0 or die("Join failed\n$cmd");
+       if (system($cmd) != 0) {
+           warn("Join failed\n$cmd");
+           return undef;
+       }
 
-       $self->check_or_start($ret,
-                             ($ENV{SMBD_MAXTIME} or 2700),
-                              "yes", "yes", "yes");
+       # We need world access to this share, as otherwise the domain
+       # administrator from the AD domain provided by Samba4 can't
+       # access the share for tests.
+       chmod 0777, "$prefix/share";
 
-       if (not $self->wait_for_start($ret)) {
-              return undef;
+       if (not $self->check_or_start($ret, "yes", "yes", "yes")) {
+               return undef;
        }
 
        $ret->{DC_SERVER} = $dcvars->{SERVER};
        $ret->{DC_SERVER_IP} = $dcvars->{SERVER_IP};
+       $ret->{DC_SERVER_IPV6} = $dcvars->{SERVER_IPV6};
        $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
        $ret->{DC_USERNAME} = $dcvars->{USERNAME};
        $ret->{DC_PASSWORD} = $dcvars->{PASSWORD};
 
+       # Special case, this is called from Samba4.pm but needs to use the Samba3 check_env and get_log_env
+       $ret->{target} = $self;
+
        return $ret;
 }
 
-sub setup_secshare($$)
+sub setup_admember_rfc2307($$$$)
+{
+       my ($self, $prefix, $dcvars) = @_;
+
+       # If we didn't build with ADS, pretend this env was never available
+       if (not $self->have_ads()) {
+               return "UNKNOWN";
+       }
+
+       print "PROVISIONING S3 AD MEMBER WITH idmap_rfc2307 config...";
+
+       my $member_options = "
+       security = ads
+       server signing = on
+        workgroup = $dcvars->{DOMAIN}
+        realm = $dcvars->{REALM}
+        idmap config $dcvars->{DOMAIN} : backend = rfc2307
+        idmap config $dcvars->{DOMAIN} : range = 2000000-2999999
+        idmap config $dcvars->{DOMAIN} : ldap_server = ad
+        idmap config $dcvars->{DOMAIN} : bind_path_user = ou=idmap,dc=samba,dc=example,dc=com
+        idmap config $dcvars->{DOMAIN} : bind_path_group = ou=idmap,dc=samba,dc=example,dc=com
+";
+
+       my $ret = $self->provision($prefix,
+                                  "RFC2307MEMBER",
+                                  "loCalMemberPass",
+                                  $member_options,
+                                  $dcvars->{SERVER_IP},
+                                  $dcvars->{SERVER_IPV6});
+
+       $ret or return undef;
+
+       close(USERMAP);
+       $ret->{DOMAIN} = $dcvars->{DOMAIN};
+       $ret->{REALM} = $dcvars->{REALM};
+
+       my $ctx;
+       my $prefix_abs = abs_path($prefix);
+       $ctx = {};
+       $ctx->{krb5_conf} = "$prefix_abs/lib/krb5.conf";
+       $ctx->{domain} = $dcvars->{DOMAIN};
+       $ctx->{realm} = $dcvars->{REALM};
+       $ctx->{dnsname} = lc($dcvars->{REALM});
+       $ctx->{kdc_ipv4} = $dcvars->{SERVER_IP};
+       $ctx->{kdc_ipv6} = $dcvars->{SERVER_IPV6};
+       Samba::mk_krb5_conf($ctx, "");
+
+       $ret->{KRB5_CONFIG} = $ctx->{krb5_conf};
+
+       my $net = Samba::bindir_path($self, "net");
+       my $cmd = "";
+       $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+       if (defined($ret->{RESOLV_WRAPPER_CONF})) {
+               $cmd .= "RESOLV_WRAPPER_CONF=\"$ret->{RESOLV_WRAPPER_CONF}\" ";
+       } else {
+               $cmd .= "RESOLV_WRAPPER_HOSTS=\"$ret->{RESOLV_WRAPPER_HOSTS}\" ";
+       }
+       $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
+       $cmd .= "$net join $ret->{CONFIGURATION}";
+       $cmd .= " -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}";
+
+       if (system($cmd) != 0) {
+           warn("Join failed\n$cmd");
+           return undef;
+       }
+
+       # We need world access to this share, as otherwise the domain
+       # administrator from the AD domain provided by Samba4 can't
+       # access the share for tests.
+       chmod 0777, "$prefix/share";
+
+       if (not $self->check_or_start($ret, "yes", "yes", "yes")) {
+               return undef;
+       }
+
+       $ret->{DC_SERVER} = $dcvars->{SERVER};
+       $ret->{DC_SERVER_IP} = $dcvars->{SERVER_IP};
+       $ret->{DC_SERVER_IPV6} = $dcvars->{SERVER_IPV6};
+       $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
+       $ret->{DC_USERNAME} = $dcvars->{USERNAME};
+       $ret->{DC_PASSWORD} = $dcvars->{PASSWORD};
+
+       # Special case, this is called from Samba4.pm but needs to use the Samba3 check_env and get_log_env
+       $ret->{target} = $self;
+
+       return $ret;
+}
+
+sub setup_simpleserver($$)
 {
        my ($self, $path) = @_;
 
-       print "PROVISIONING server with security=share...";
+       print "PROVISIONING simple server...";
+
+       my $prefix_abs = abs_path($path);
 
-       my $secshare_options = "
-       security = share
+       my $simpleserver_options = "
        lanman auth = yes
+       vfs objects = xattr_tdb streams_depot
+       change notify = no
+
+[vfs_aio_fork]
+       path = $prefix_abs/share
+        vfs objects = aio_fork
+        read only = no
+        vfs_aio_fork:erratic_testing_mode=yes
 ";
 
        my $vars = $self->provision($path,
                                    "LOCALSHARE4",
-                                   4,
                                    "local4pass",
-                                   $secshare_options);
+                                   $simpleserver_options);
 
        $vars or return undef;
 
-       $self->check_or_start($vars,
-                             ($ENV{SMBD_MAXTIME} or 2700),
-                              "yes", "no", "yes");
-
-       if (not $self->wait_for_start($vars)) {
+       if (not $self->check_or_start($vars, "yes", "no", "yes")) {
               return undef;
        }
 
-       $self->{vars}->{secshare} = $vars;
+       $self->{vars}->{simpleserver} = $vars;
 
        return $vars;
 }
 
-sub setup_secserver($$$)
+sub setup_fileserver($$)
 {
-       my ($self, $prefix, $dcvars) = @_;
+       my ($self, $path) = @_;
+       my $prefix_abs = abs_path($path);
+       my $srcdir_abs = abs_path($self->{srcdir});
 
-       print "PROVISIONING server with security=server...";
+       print "PROVISIONING file server ...\n";
 
-       my $secserver_options = "
-       security = server
-        password server = $dcvars->{SERVER_IP}
-";
+       my @dirs = ();
 
-       my $ret = $self->provision($prefix,
-                                  "LOCALSERVER5",
-                                  5,
-                                  "localserver5pass",
-                                  $secserver_options);
+       mkdir($prefix_abs, 0777);
 
-       $ret or return undef;
+       my $share_dir="$prefix_abs/share";
+
+       # Create share directory structure
+       my $lower_case_share_dir="$share_dir/lower-case";
+       push(@dirs, $lower_case_share_dir);
+
+       my $lower_case_share_dir_30000="$share_dir/lower-case-30000";
+       push(@dirs, $lower_case_share_dir_30000);
+
+       my $dfree_share_dir="$share_dir/dfree";
+       push(@dirs, $dfree_share_dir);
+       push(@dirs, "$dfree_share_dir/subdir1");
+       push(@dirs, "$dfree_share_dir/subdir2");
+
+       my $valid_users_sharedir="$share_dir/valid_users";
+       push(@dirs,$valid_users_sharedir);
+
+       my $offline_sharedir="$share_dir/offline";
+       push(@dirs,$offline_sharedir);
+
+       my $fileserver_options = "
+[lowercase]
+       path = $lower_case_share_dir
+       comment = smb username is [%U]
+       case sensitive = True
+       default case = lower
+       preserve case = no
+       short preserve case = no
+[lowercase-30000]
+       path = $lower_case_share_dir_30000
+       comment = smb username is [%U]
+       case sensitive = True
+       default case = lower
+       preserve case = no
+       short preserve case = no
+[dfree]
+       path = $dfree_share_dir
+       comment = smb username is [%U]
+       dfree command = $srcdir_abs/testprogs/blackbox/dfree.sh
+[valid-users-access]
+       path = $valid_users_sharedir
+       valid users = +userdup
+[offline]
+       path = $offline_sharedir
+       vfs objects = offline
+       ";
 
-       $self->check_or_start($ret,
-                             ($ENV{SMBD_MAXTIME} or 2700),
-                              "yes", "no", "yes");
+       my $vars = $self->provision($path,
+                                   "FILESERVER",
+                                   "fileserver",
+                                   $fileserver_options,
+                                   undef,
+                                   undef,
+                                   1);
+
+       $vars or return undef;
 
-       if (not $self->wait_for_start($ret)) {
+       if (not $self->check_or_start($vars, "yes", "no", "yes")) {
               return undef;
        }
 
-       $ret->{DC_SERVER} = $dcvars->{SERVER};
-       $ret->{DC_SERVER_IP} = $dcvars->{SERVER_IP};
-       $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
-       $ret->{DC_USERNAME} = $dcvars->{USERNAME};
-       $ret->{DC_PASSWORD} = $dcvars->{PASSWORD};
+       $self->{vars}->{fileserver} = $vars;
 
-       return $ret;
+       mkdir($_, 0777) foreach(@dirs);
+
+       ## Create case sensitive lower case share dir
+       foreach my $file ('a'..'z') {
+               my $full_path = $lower_case_share_dir . '/' . $file;
+               open my $fh, '>', $full_path;
+               # Add some content to file
+               print $fh $full_path;
+               close $fh;
+       }
+
+       for (my $file = 1; $file < 51; ++$file) {
+               my $full_path = $lower_case_share_dir . '/' . $file;
+               open my $fh, '>', $full_path;
+               # Add some content to file
+               print $fh $full_path;
+               close $fh;
+       }
+
+       # Create content for 30000 share
+       foreach my $file ('a'..'z') {
+               my $full_path = $lower_case_share_dir_30000 . '/' . $file;
+               open my $fh, '>', $full_path;
+               # Add some content to file
+               print $fh $full_path;
+               close $fh;
+       }
+
+       for (my $file = 1; $file < 30001; ++$file) {
+               my $full_path = $lower_case_share_dir_30000 . '/' . $file;
+               open my $fh, '>', $full_path;
+               # Add some content to file
+               print $fh $full_path;
+               close $fh;
+       }
+
+       ##
+       ## create a listable file in valid_users_share
+       ##
+        my $valid_users_target = "$valid_users_sharedir/foo";
+        unless (open(VALID_USERS_TARGET, ">$valid_users_target")) {
+                warn("Unable to open $valid_users_target");
+                return undef;
+        }
+        close(VALID_USERS_TARGET);
+        chmod 0644, $valid_users_target;
+
+       return $vars;
 }
 
 sub setup_ktest($$$)
 {
-       my ($self, $prefix, $dcvars) = @_;
+       my ($self, $prefix) = @_;
+
+       # If we didn't build with ADS, pretend this env was never available
+       if (not $self->have_ads()) {
+               return "UNKNOWN";
+       }
 
        print "PROVISIONING server with security=ads...";
 
@@ -284,16 +708,29 @@ sub setup_ktest($$$)
         realm = ktest.samba.example.com
        security = ads
         username map = $prefix/lib/username.map
+        server signing = required
 ";
 
        my $ret = $self->provision($prefix,
                                   "LOCALKTEST6",
-                                  5,
                                   "localktest6pass",
                                   $ktest_options);
 
        $ret or return undef;
 
+       my $ctx;
+       my $prefix_abs = abs_path($prefix);
+       $ctx = {};
+       $ctx->{krb5_conf} = "$prefix_abs/lib/krb5.conf";
+       $ctx->{domain} = "KTEST";
+       $ctx->{realm} = "KTEST.SAMBA.EXAMPLE.COM";
+       $ctx->{dnsname} = lc($ctx->{realm});
+       $ctx->{kdc_ipv4} = "0.0.0.0";
+       $ctx->{kdc_ipv6} = "::";
+       Samba::mk_krb5_conf($ctx, "");
+
+       $ret->{KRB5_CONFIG} = $ctx->{krb5_conf};
+
        open(USERMAP, ">$prefix/lib/username.map") or die("Unable to open $prefix/lib/username.map");
        print USERMAP "
 $ret->{USERNAME} = KTEST\\Administrator
@@ -307,6 +744,9 @@ $ret->{USERNAME} = KTEST\\Administrator
        system("cp $self->{srcdir}/source3/selftest/ktest-secrets.tdb $prefix/private/secrets.tdb");
        chmod 0600, "$prefix/private/secrets.tdb";
 
+#Make sure there's no old ntdb file.
+       system("rm -f $prefix/private/secrets.ntdb");
+
 #This uses a pre-calculated krb5 credentials cache, obtained by running Samba4 with:
 # "--option=kdc:service ticket lifetime=239232" "--option=kdc:user ticket lifetime=239232" "--option=kdc:renewal lifetime=239232"
 #
@@ -338,16 +778,43 @@ $ret->{USERNAME} = KTEST\\Administrator
        system("cp $self->{srcdir}/source3/selftest/ktest-krb5_ccache-3 $prefix/krb5_ccache-3");
        chmod 0600, "$prefix/krb5_ccache-3";
 
-       $self->check_or_start($ret,
-                             ($ENV{SMBD_MAXTIME} or 2700),
-                              "yes", "no", "yes");
+       # We need world access to this share, as otherwise the domain
+       # administrator from the AD domain provided by ktest can't
+       # access the share for tests.
+       chmod 0777, "$prefix/share";
 
-       if (not $self->wait_for_start($ret)) {
+       if (not $self->check_or_start($ret, "yes", "no", "yes")) {
               return undef;
        }
        return $ret;
 }
 
+sub setup_maptoguest($$)
+{
+       my ($self, $path) = @_;
+
+       print "PROVISIONING maptoguest...";
+
+       my $options = "
+map to guest = bad user
+";
+
+       my $vars = $self->provision($path,
+                                   "maptoguest",
+                                   "maptoguestpass",
+                                   $options);
+
+       $vars or return undef;
+
+       if (not $self->check_or_start($vars, "yes", "no", "yes")) {
+              return undef;
+       }
+
+       $self->{vars}->{s3maptoguest} = $vars;
+
+       return $vars;
+}
+
 sub stop_sig_term($$) {
        my ($self, $pid) = @_;
        kill("USR1", $pid) or kill("ALRM", $pid) or warn("Unable to kill $pid: $!");
@@ -378,7 +845,12 @@ sub read_pid($$)
 }
 
 sub check_or_start($$$$$) {
-       my ($self, $env_vars, $maxtime, $nmbd, $winbindd, $smbd) = @_;
+       my ($self, $env_vars, $nmbd, $winbindd, $smbd) = @_;
+
+       # use a pipe for stdin in the child processes. This allows
+       # those processes to monitor the pipe for EOF to ensure they
+       # exit when the test script exits
+       pipe(STDIN_READER, $env_vars->{STDIN_PIPE});
 
        unlink($env_vars->{NMBD_TEST_LOG});
        print "STARTING NMBD...";
@@ -389,12 +861,19 @@ sub check_or_start($$$$$) {
 
                SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
 
-               $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+               $ENV{KRB5_CONFIG} = $env_vars->{KRB5_CONFIG};
+               $ENV{SELFTEST_WINBINDD_SOCKET_DIR} = $env_vars->{SELFTEST_WINBINDD_SOCKET_DIR};
                $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
 
                $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
-               $ENV{NSS_WRAPPER_WINBIND_SO_PATH} = $env_vars->{NSS_WRAPPER_WINBIND_SO_PATH};
+               $ENV{NSS_WRAPPER_HOSTS} = $env_vars->{NSS_WRAPPER_HOSTS};
+               $ENV{NSS_WRAPPER_HOSTNAME} = $env_vars->{NSS_WRAPPER_HOSTNAME};
+               $ENV{NSS_WRAPPER_MODULE_SO_PATH} = $env_vars->{NSS_WRAPPER_MODULE_SO_PATH};
+               $ENV{NSS_WRAPPER_MODULE_FN_PREFIX} = $env_vars->{NSS_WRAPPER_MODULE_FN_PREFIX};
+               $ENV{UID_WRAPPER_ROOT} = "1";
+
+               $ENV{ENVNAME} = "$ENV{ENVNAME}.nmbd";
 
                if ($nmbd ne "yes") {
                        $SIG{USR1} = $SIG{ALRM} = $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub {
@@ -402,24 +881,33 @@ sub check_or_start($$$$$) {
                                print("Skip nmbd received signal $signame");
                                exit 0;
                        };
-                       sleep($maxtime);
+                       sleep($self->{server_maxtime});
                        exit 0;
                }
 
+               $ENV{MAKE_TEST_BINARY} = Samba::bindir_path($self, "nmbd");
                my @optargs = ("-d0");
                if (defined($ENV{NMBD_OPTIONS})) {
                        @optargs = split(/ /, $ENV{NMBD_OPTIONS});
                }
-
-               $ENV{MAKE_TEST_BINARY} = $self->binpath("nmbd");
-
-               my @preargs = ($self->binpath("timelimit"), $maxtime);
+               my @preargs = (Samba::bindir_path($self, "timelimit"), $self->{server_maxtime});
                if(defined($ENV{NMBD_VALGRIND})) { 
                        @preargs = split(/ /, $ENV{NMBD_VALGRIND});
                }
+               my @args = ("-F", "--no-process-group",
+                           "-s", $env_vars->{SERVERCONFFILE},
+                           "-l", $env_vars->{LOGDIR});
+               if (not defined($ENV{NMBD_DONT_LOG_STDOUT})) {
+                       push(@args, "--log-stdout");
+               }
+
+               close($env_vars->{STDIN_PIPE});
+               open STDIN, ">&", \*STDIN_READER or die "can't dup STDIN_READER to STDIN: $!";
 
-               exec(@preargs, $self->binpath("nmbd"), "-F", "--no-process-group", "-S", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start nmbd: $!");
+               exec(@preargs, $ENV{MAKE_TEST_BINARY}, @args, @optargs)
+                       or die("Unable to start $ENV{MAKE_TEST_BINARY}: $!");
        }
+       $env_vars->{NMBD_TL_PID} = $pid;
        write_pid($env_vars, "nmbd", $pid);
        print "DONE\n";
 
@@ -432,12 +920,24 @@ sub check_or_start($$$$$) {
 
                SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
 
-               $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+               $ENV{KRB5_CONFIG} = $env_vars->{KRB5_CONFIG};
+               $ENV{SELFTEST_WINBINDD_SOCKET_DIR} = $env_vars->{SELFTEST_WINBINDD_SOCKET_DIR};
                $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
 
                $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
-               $ENV{NSS_WRAPPER_WINBIND_SO_PATH} = $env_vars->{NSS_WRAPPER_WINBIND_SO_PATH};
+               $ENV{NSS_WRAPPER_HOSTS} = $env_vars->{NSS_WRAPPER_HOSTS};
+               $ENV{NSS_WRAPPER_HOSTNAME} = $env_vars->{NSS_WRAPPER_HOSTNAME};
+               $ENV{NSS_WRAPPER_MODULE_SO_PATH} = $env_vars->{NSS_WRAPPER_MODULE_SO_PATH};
+               $ENV{NSS_WRAPPER_MODULE_FN_PREFIX} = $env_vars->{NSS_WRAPPER_MODULE_FN_PREFIX};
+               if (defined($env_vars->{RESOLV_WRAPPER_CONF})) {
+                       $ENV{RESOLV_WRAPPER_CONF} = $env_vars->{RESOLV_WRAPPER_CONF};
+               } else {
+                       $ENV{RESOLV_WRAPPER_HOSTS} = $env_vars->{RESOLV_WRAPPER_HOSTS};
+               }
+               $ENV{UID_WRAPPER_ROOT} = "1";
+
+               $ENV{ENVNAME} = "$ENV{ENVNAME}.winbindd";
 
                if ($winbindd ne "yes") {
                        $SIG{USR1} = $SIG{ALRM} = $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub {
@@ -445,24 +945,33 @@ sub check_or_start($$$$$) {
                                print("Skip winbindd received signal $signame");
                                exit 0;
                        };
-                       sleep($maxtime);
+                       sleep($self->{server_maxtime});
                        exit 0;
                }
 
+               $ENV{MAKE_TEST_BINARY} = Samba::bindir_path($self, "winbindd");
                my @optargs = ("-d0");
                if (defined($ENV{WINBINDD_OPTIONS})) {
                        @optargs = split(/ /, $ENV{WINBINDD_OPTIONS});
                }
-
-               $ENV{MAKE_TEST_BINARY} = $self->binpath("winbindd");
-
-               my @preargs = ($self->binpath("timelimit"), $maxtime);
+               my @preargs = (Samba::bindir_path($self, "timelimit"), $self->{server_maxtime});
                if(defined($ENV{WINBINDD_VALGRIND})) {
                        @preargs = split(/ /, $ENV{WINBINDD_VALGRIND});
                }
+               my @args = ("-F", "--no-process-group",
+                           "-s", $env_vars->{SERVERCONFFILE},
+                           "-l", $env_vars->{LOGDIR});
+               if (not defined($ENV{WINBINDD_DONT_LOG_STDOUT})) {
+                       push(@args, "--stdout");
+               }
 
-               exec(@preargs, $self->binpath("winbindd"), "-F", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start winbindd: $!");
+               close($env_vars->{STDIN_PIPE});
+               open STDIN, ">&", \*STDIN_READER or die "can't dup STDIN_READER to STDIN: $!";
+
+               exec(@preargs, $ENV{MAKE_TEST_BINARY}, @args, @optargs)
+                       or die("Unable to start $ENV{MAKE_TEST_BINARY}: $!");
        }
+       $env_vars->{WINBINDD_TL_PID} = $pid;
        write_pid($env_vars, "winbindd", $pid);
        print "DONE\n";
 
@@ -475,12 +984,24 @@ sub check_or_start($$$$$) {
 
                SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
 
-               $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+               $ENV{KRB5_CONFIG} = $env_vars->{KRB5_CONFIG};
+               $ENV{SELFTEST_WINBINDD_SOCKET_DIR} = $env_vars->{SELFTEST_WINBINDD_SOCKET_DIR};
                $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
 
                $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
-               $ENV{NSS_WRAPPER_WINBIND_SO_PATH} = $env_vars->{NSS_WRAPPER_WINBIND_SO_PATH};
+               $ENV{NSS_WRAPPER_HOSTS} = $env_vars->{NSS_WRAPPER_HOSTS};
+               $ENV{NSS_WRAPPER_HOSTNAME} = $env_vars->{NSS_WRAPPER_HOSTNAME};
+               $ENV{NSS_WRAPPER_MODULE_SO_PATH} = $env_vars->{NSS_WRAPPER_MODULE_SO_PATH};
+               $ENV{NSS_WRAPPER_MODULE_FN_PREFIX} = $env_vars->{NSS_WRAPPER_MODULE_FN_PREFIX};
+               if (defined($env_vars->{RESOLV_WRAPPER_CONF})) {
+                       $ENV{RESOLV_WRAPPER_CONF} = $env_vars->{RESOLV_WRAPPER_CONF};
+               } else {
+                       $ENV{RESOLV_WRAPPER_HOSTS} = $env_vars->{RESOLV_WRAPPER_HOSTS};
+               }
+               $ENV{UID_WRAPPER_ROOT} = "1";
+
+               $ENV{ENVNAME} = "$ENV{ENVNAME}.smbd";
 
                if ($smbd ne "yes") {
                        $SIG{USR1} = $SIG{ALRM} = $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub {
@@ -488,37 +1009,53 @@ sub check_or_start($$$$$) {
                                print("Skip smbd received signal $signame");
                                exit 0;
                        };
-                       sleep($maxtime);
+                       sleep($self->{server_maxtime});
                        exit 0;
                }
 
-               $ENV{MAKE_TEST_BINARY} = $self->binpath("smbd");
+               $ENV{MAKE_TEST_BINARY} = Samba::bindir_path($self, "smbd");
                my @optargs = ("-d0");
                if (defined($ENV{SMBD_OPTIONS})) {
                        @optargs = split(/ /, $ENV{SMBD_OPTIONS});
                }
-               my @preargs = ($self->binpath("timelimit"), $maxtime);
+               my @preargs = (Samba::bindir_path($self, "timelimit"), $self->{server_maxtime});
                if(defined($ENV{SMBD_VALGRIND})) {
                        @preargs = split(/ /,$ENV{SMBD_VALGRIND});
                }
-               exec(@preargs, $self->binpath("smbd"), "-F", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start smbd: $!");
+               my @args = ("-F", "--no-process-group",
+                           "-s", $env_vars->{SERVERCONFFILE},
+                           "-l", $env_vars->{LOGDIR});
+               if (not defined($ENV{SMBD_DONT_LOG_STDOUT})) {
+                       push(@args, "--log-stdout");
+               }
+
+               close($env_vars->{STDIN_PIPE});
+               open STDIN, ">&", \*STDIN_READER or die "can't dup STDIN_READER to STDIN: $!";
+
+               exec(@preargs, $ENV{MAKE_TEST_BINARY}, @args, @optargs)
+                       or die("Unable to start $ENV{MAKE_TEST_BINARY}: $!");
        }
+       $env_vars->{SMBD_TL_PID} = $pid;
        write_pid($env_vars, "smbd", $pid);
        print "DONE\n";
 
-       return 0;
+       close(STDIN_READER);
+
+       return $self->wait_for_start($env_vars, $nmbd, $winbindd, $smbd);
 }
 
-sub provision($$$$$$)
+sub provision($$$$$$$$)
 {
-       my ($self, $prefix, $server, $swiface, $password, $extra_options) = @_;
+       my ($self, $prefix, $server, $password, $extra_options, $dc_server_ip, $dc_server_ipv6, $no_delete_prefix) = @_;
 
        ##
        ## setup the various environment variables we need
        ##
 
+       my $swiface = Samba::get_interface($server);
        my %ret = ();
        my $server_ip = "127.0.0.$swiface";
+       my $server_ipv6 = sprintf("fd00:0000:0000:0000:0000:0000:5357:5f%02x", $swiface);
        my $domain = "SAMBA-TEST";
 
        my $unix_name = ($ENV{USER} or $ENV{LOGNAME} or `PATH=/usr/ucb:$ENV{PATH} whoami`);
@@ -529,7 +1066,6 @@ sub provision($$$$$$)
 
        my $prefix_abs = abs_path($prefix);
        my $bindir_abs = abs_path($self->{bindir});
-       my $vfs_modulesdir_abs = ($ENV{VFSLIBDIR} or $bindir_abs);
 
        my @dirs = ();
 
@@ -572,6 +1108,33 @@ sub provision($$$$$$)
        my $msdfs_deeppath="$msdfs_shrdir/deeppath";
        push(@dirs,$msdfs_deeppath);
 
+       my $badnames_shrdir="$shrdir/badnames";
+       push(@dirs,$badnames_shrdir);
+
+       my $lease1_shrdir="$shrdir/SMB2_10";
+       push(@dirs,$lease1_shrdir);
+
+       my $lease2_shrdir="$shrdir/SMB3_00";
+       push(@dirs,$lease2_shrdir);
+
+       my $manglenames_shrdir="$shrdir/manglenames";
+       push(@dirs,$manglenames_shrdir);
+
+       my $widelinks_shrdir="$shrdir/widelinks";
+       push(@dirs,$widelinks_shrdir);
+
+       my $widelinks_linkdir="$shrdir/widelinks_foo";
+       push(@dirs,$widelinks_linkdir);
+
+       my $shadow_tstdir="$shrdir/shadow";
+       push(@dirs,$shadow_tstdir);
+       my $shadow_mntdir="$shadow_tstdir/mount";
+       push(@dirs,$shadow_mntdir);
+       my $shadow_basedir="$shadow_mntdir/base";
+       push(@dirs,$shadow_basedir);
+       my $shadow_shrdir="$shadow_basedir/share";
+       push(@dirs,$shadow_shrdir);
+
        # this gets autocreated by winbindd
        my $wbsockdir="$prefix_abs/winbindd";
        my $wbsockprivdir="$lockdir/winbindd_privileged";
@@ -587,34 +1150,112 @@ sub provision($$$$$$)
 
        mkdir($prefix_abs, 0777);
        print "CREATE TEST ENVIRONMENT IN '$prefix'...";
-       system("rm -rf $prefix_abs/*");
+       if (not defined($no_delete_prefix) or not $no_delete_prefix) {
+           system("rm -rf $prefix_abs/*");
+       }
        mkdir($_, 0777) foreach(@dirs);
 
+       my $fs_specific_conf = $self->get_fs_specific_conf($shrdir);
+
+       ##
+       ## lockdir and piddir must be 0755
+       ##
+       chmod 0755, $lockdir;
+       chmod 0755, $piddir;
+
+
        ##
        ## create ro and msdfs share layout
        ##
 
        chmod 0755, $ro_shrdir;
        my $unreadable_file = "$ro_shrdir/unreadable_file";
-       open(UNREADABLE_FILE, ">$unreadable_file") or die("Unable to open $unreadable_file");
+       unless (open(UNREADABLE_FILE, ">$unreadable_file")) {
+               warn("Unable to open $unreadable_file");
+               return undef;
+       }
        close(UNREADABLE_FILE);
        chmod 0600, $unreadable_file;
 
        my $msdfs_target = "$ro_shrdir/msdfs-target";
-       open(MSDFS_TARGET, ">$msdfs_target") or die("Unable to open $msdfs_target");
+       unless (open(MSDFS_TARGET, ">$msdfs_target")) {
+               warn("Unable to open $msdfs_target");
+               return undef;
+       }
        close(MSDFS_TARGET);
        chmod 0666, $msdfs_target;
-       symlink "msdfs:$server_ip\\ro-tmp", "$msdfs_shrdir/msdfs-src1";
-       symlink "msdfs:$server_ip\\ro-tmp", "$msdfs_shrdir/deeppath/msdfs-src2";
+       symlink "msdfs:$server_ip\\ro-tmp,$server_ipv6\\ro-tmp",
+               "$msdfs_shrdir/msdfs-src1";
+       symlink "msdfs:$server_ipv6\\ro-tmp", "$msdfs_shrdir/deeppath/msdfs-src2";
+
+       ##
+       ## create bad names in $badnames_shrdir
+       ##
+       ## (An invalid name, would be mangled to 8.3).
+        my $badname_target = "$badnames_shrdir/\340|\231\216\377\177";
+        unless (open(BADNAME_TARGET, ">$badname_target")) {
+                warn("Unable to open $badname_target");
+                return undef;
+        }
+        close(BADNAME_TARGET);
+        chmod 0666, $badname_target;
+
+       ## (A bad name, would not be mangled to 8.3).
+        my $badname_target = "$badnames_shrdir/\240\276\346\327\377\177";
+        unless (open(BADNAME_TARGET, ">$badname_target")) {
+                warn("Unable to open $badname_target");
+                return undef;
+        }
+        close(BADNAME_TARGET);
+        chmod 0666, $badname_target;
+
+       ## (A bad good name).
+        my $badname_target = "$badnames_shrdir/blank.txt";
+        unless (open(BADNAME_TARGET, ">$badname_target")) {
+                warn("Unable to open $badname_target");
+                return undef;
+        }
+        close(BADNAME_TARGET);
+        chmod 0666, $badname_target;
+
+       ##
+       ## create mangleable directory names in $manglenames_shrdir
+       ##
+        my $manglename_target = "$manglenames_shrdir/foo:bar";
+       mkdir($manglename_target, 0777);
+
+       ##
+       ## create symlinks for widelinks tests.
+       ##
+       my $widelinks_target = "$widelinks_linkdir/target";
+       unless (open(WIDELINKS_TARGET, ">$widelinks_target")) {
+               warn("Unable to open $widelinks_target");
+               return undef;
+       }
+       close(WIDELINKS_TARGET);
+       chmod 0666, $widelinks_target;
+       ##
+       ## This link should get ACCESS_DENIED
+       ##
+       symlink "$widelinks_target", "$widelinks_shrdir/source";
+       ##
+       ## This link should be allowed
+       ##
+       symlink "$widelinks_shrdir", "$widelinks_shrdir/dot";
 
        my $conffile="$libdir/server.conf";
 
        my $nss_wrapper_pl = "$ENV{PERL} $self->{srcdir}/lib/nss_wrapper/nss_wrapper.pl";
        my $nss_wrapper_passwd = "$privatedir/passwd";
        my $nss_wrapper_group = "$privatedir/group";
+       my $nss_wrapper_hosts = "$ENV{SELFTEST_PREFIX}/hosts";
+       my $resolv_conf = "$privatedir/resolv.conf";
+       my $dns_host_file = "$ENV{SELFTEST_PREFIX}/dns_host_file";
 
        my $mod_printer_pl = "$ENV{PERL} $self->{srcdir}/source3/script/tests/printing/modprinter.pl";
 
+       my $fake_snap_pl = "$ENV{PERL} $self->{srcdir}/source3/script/tests/fake_snap.pl";
+
        my @eventlog_list = ("dns server", "application");
 
        ##
@@ -622,10 +1263,12 @@ sub provision($$$$$$)
        ##
 
        my ($max_uid, $max_gid);
-       my ($uid_nobody, $uid_root);
-       my ($gid_nobody, $gid_nogroup, $gid_root, $gid_domusers);
+       my ($uid_nobody, $uid_root, $uid_pdbtest, $uid_pdbtest2, $uid_userdup);
+       my ($uid_pdbtest_wkn);
+       my ($gid_nobody, $gid_nogroup, $gid_root, $gid_domusers, $gid_domadmins);
+       my ($gid_userdup, $gid_everyone);
 
-       if ($unix_uid < 0xffff - 2) {
+       if ($unix_uid < 0xffff - 5) {
                $max_uid = 0xffff;
        } else {
                $max_uid = $unix_uid;
@@ -633,8 +1276,12 @@ sub provision($$$$$$)
 
        $uid_root = $max_uid - 1;
        $uid_nobody = $max_uid - 2;
+       $uid_pdbtest = $max_uid - 3;
+       $uid_pdbtest2 = $max_uid - 4;
+       $uid_userdup = $max_uid - 5;
+       $uid_pdbtest_wkn = $max_uid - 6;
 
-       if ($unix_gids[0] < 0xffff - 3) {
+       if ($unix_gids[0] < 0xffff - 7) {
                $max_gid = 0xffff;
        } else {
                $max_gid = $unix_gids[0];
@@ -644,18 +1291,25 @@ sub provision($$$$$$)
        $gid_nogroup = $max_gid - 2;
        $gid_root = $max_gid - 3;
        $gid_domusers = $max_gid - 4;
+       $gid_domadmins = $max_gid - 5;
+       $gid_userdup = $max_gid - 6;
+       $gid_everyone = $max_gid - 7;
 
        ##
        ## create conffile
        ##
 
-       open(CONF, ">$conffile") or die("Unable to open $conffile");
+       unless (open(CONF, ">$conffile")) {
+               warn("Unable to open $conffile");
+               return undef;
+       }
        print CONF "
 [global]
        netbios name = $server
-       interfaces = $server_ip/8
+       interfaces = $server_ip/8 $server_ipv6/64
        bind interfaces only = yes
-       panic action = $self->{srcdir}/selftest/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
+       panic action = cd $self->{srcdir} && $self->{srcdir}/selftest/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
+       smbd:suicide mode = yes
 
        workgroup = $domain
 
@@ -663,12 +1317,10 @@ sub provision($$$$$$)
        pid directory = $piddir
        lock directory = $lockdir
        log file = $logdir/log.\%m
-       log level = 0
+       log level = 1
        debug pid = yes
         max log size = 0
 
-       name resolve order = bcast
-
        state directory = $lockdir
        cache directory = $lockdir
 
@@ -691,31 +1343,35 @@ sub provision($$$$$$)
 
        kernel oplocks = no
        kernel change notify = no
+       smb2 leases = yes
 
-       syslog = no
+       logging = file
        printing = bsd
        printcap name = /dev/null
 
-       winbindd:socket dir = $wbsockdir
+       winbindd socket directory = $wbsockdir
        nmbd:socket dir = $nmbdsockdir
        idmap config * : range = 100000-200000
        winbind enum users = yes
        winbind enum groups = yes
+       winbind separator = /
 
 #      min receivefile size = 4000
 
-       max protocol = SMB2
        read only = no
        server signing = auto
 
        smbd:sharedelay = 100000
-#      smbd:writetimeupdatedelay = 500000
+       smbd:writetimeupdatedelay = 500000
        map hidden = no
        map system = no
        map readonly = no
        store dos attributes = yes
        create mask = 755
-       vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
+       dos filemode = yes
+       strict rename = yes
+       strict sync = yes
+       vfs objects = acl_xattr fake_acls xattr_tdb streams_depot
 
        printing = vlp
        print command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb print %p %s
@@ -726,9 +1382,28 @@ sub provision($$$$$$)
        queue pause command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb queuepause %p
        queue resume command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb queueresume %p
        lpq cache time = 0
+       print notify backchannel = yes
+
+       ncalrpc dir = $prefix_abs/ncalrpc
+
+        # The samba3.blackbox.smbclient_s3 test uses this to test that
+        # sending messages works, and that the %m sub works.
+        message command = mv %s $shrdir/message.%m
+
+       # fsrvp server requires registry shares
+       registry shares = yes
+
+       # Used by RPC SRVSVC tests
+       add share command = $bindir_abs/smbaddshare
+       change share command = $bindir_abs/smbchangeshare
+       delete share command = $bindir_abs/smbdeleteshare
+
+       # fruit:copyfile is a global option
+       fruit:copyfile = yes
 
-       ncalrpc dir = $lockdir/ncalrpc
-       rpc_server:epmapper = embedded
+       #this does not mean that we use non-secure test env,
+       #it just means we ALLOW one to be configured.
+       allow insecure wide links = yes
 
        # Begin extra options
        $extra_options
@@ -744,6 +1419,16 @@ sub provision($$$$$$)
        print CONF "
 [tmp]
        path = $shrdir
+        comment = smb username is [%U]
+[tmpsort]
+       path = $shrdir
+       comment = Load dirsort module
+       vfs objects = dirsort acl_xattr fake_acls xattr_tdb streams_depot
+[tmpenc]
+       path = $shrdir
+       comment = encrypt smb username is [%U]
+       smb encrypt = required
+       vfs objects = dirsort
 [tmpguest]
        path = $shrdir
         guest ok = yes
@@ -755,6 +1440,16 @@ sub provision($$$$$$)
        path = $shrdir
         force user = $unix_name
         guest ok = yes
+[forceuser_unixonly]
+       comment = force a user with unix user SID and group SID
+       path = $shrdir
+       force user = pdbtest
+       guest ok = yes
+[forceuser_wkngroup]
+       comment = force a user with well-known group SID
+       path = $shrdir
+       force user = pdbtest_wkn
+       guest ok = yes
 [forcegroup]
        path = $shrdir
         force group = nogroup
@@ -762,9 +1457,17 @@ sub provision($$$$$$)
 [ro-tmp]
        path = $ro_shrdir
        guest ok = yes
+[write-list-tmp]
+       path = $shrdir
+        read only = yes
+       write list = $unix_name
+[valid-users-tmp]
+       path = $shrdir
+       valid users = $unix_name
 [msdfs-share]
        path = $msdfs_shrdir
        msdfs root = yes
+       msdfs shuffle referrals = yes
        guest ok = yes
 [hideunread]
        copy = tmp
@@ -775,6 +1478,14 @@ sub provision($$$$$$)
 [hideunwrite]
        copy = tmp
        hide unwriteable files = yes
+[durable]
+       copy = tmp
+       kernel share modes = no
+       kernel oplocks = no
+       posix locking = no
+[fs_specific]
+       copy = tmp
+       $fs_specific_conf
 [print1]
        copy = tmp
        printable = yes
@@ -783,10 +1494,142 @@ sub provision($$$$$$)
        copy = print1
 [print3]
        copy = print1
+       default devmode = no
 [lp]
        copy = print1
+
+[nfs4acl_simple]
+       path = $shrdir
+       comment = smb username is [%U]
+       nfs4:mode = simple
+       vfs objects = nfs4acl_xattr xattr_tdb
+
+[nfs4acl_special]
+       path = $shrdir
+       comment = smb username is [%U]
+       nfs4:mode = special
+       vfs objects = nfs4acl_xattr xattr_tdb
+
+[xcopy_share]
+       path = $shrdir
+       comment = smb username is [%U]
+       create mask = 777
+       force create mode = 777
+[posix_share]
+       path = $shrdir
+       comment = smb username is [%U]
+       create mask = 0777
+       force create mode = 0
+       directory mask = 0777
+       force directory mode = 0
+       vfs objects = xattr_tdb
+[aio]
+       copy = tmp
+       aio read size = 1
+       aio write size = 1
+
 [print\$]
        copy = tmp
+
+[vfs_fruit]
+       path = $shrdir
+       vfs objects = catia fruit streams_xattr acl_xattr
+       ea support = yes
+       fruit:ressource = file
+       fruit:metadata = netatalk
+       fruit:locking = netatalk
+       fruit:encoding = native
+
+[badname-tmp]
+       path = $badnames_shrdir
+       guest ok = yes
+
+[manglenames_share]
+       path = $manglenames_shrdir
+       guest ok = yes
+
+[dynamic_share]
+       path = $shrdir/%R
+       guest ok = yes
+
+[widelinks_share]
+       path = $widelinks_shrdir
+       wide links = no
+       guest ok = yes
+
+[fsrvp_share]
+       path = $shrdir
+       comment = fake shapshots using rsync
+       vfs objects = shell_snap shadow_copy2
+       shell_snap:check path command = $fake_snap_pl --check
+       shell_snap:create command = $fake_snap_pl --create
+       shell_snap:delete command = $fake_snap_pl --delete
+       # a relative path here fails, the snapshot dir is no longer found
+       shadow:snapdir = $shrdir/.snapshots
+
+[shadow1]
+       path = $shadow_shrdir
+       comment = previous versions snapshots under mount point
+       vfs objects = shadow_copy2
+       shadow:mountpoint = $shadow_mntdir
+
+[shadow2]
+       path = $shadow_shrdir
+       comment = previous versions snapshots outside mount point
+       vfs objects = shadow_copy2
+       shadow:mountpoint = $shadow_mntdir
+       shadow:snapdir = $shadow_tstdir/.snapshots
+
+[shadow3]
+       path = $shadow_shrdir
+       comment = previous versions with subvolume snapshots, snapshots under base dir
+       vfs objects = shadow_copy2
+       shadow:mountpoint = $shadow_mntdir
+       shadow:basedir = $shadow_basedir
+       shadow:snapdir = $shadow_basedir/.snapshots
+
+[shadow4]
+       path = $shadow_shrdir
+       comment = previous versions with subvolume snapshots, snapshots outside mount point
+       vfs objects = shadow_copy2
+       shadow:mountpoint = $shadow_mntdir
+       shadow:basedir = $shadow_basedir
+       shadow:snapdir = $shadow_tstdir/.snapshots
+
+[shadow5]
+       path = $shadow_shrdir
+       comment = previous versions at volume root snapshots under mount point
+       vfs objects = shadow_copy2
+       shadow:mountpoint = $shadow_shrdir
+
+[shadow6]
+       path = $shadow_shrdir
+       comment = previous versions at volume root snapshots outside mount point
+       vfs objects = shadow_copy2
+       shadow:mountpoint = $shadow_shrdir
+       shadow:snapdir = $shadow_tstdir/.snapshots
+
+[shadow7]
+       path = $shadow_shrdir
+       comment = previous versions snapshots everywhere
+       vfs objects = shadow_copy2
+       shadow:mountpoint = $shadow_mntdir
+       shadow:snapdirseverywhere = yes
+
+[shadow8]
+       path = $shadow_shrdir
+       comment = previous versions using snapsharepath
+       vfs objects = shadow_copy2
+       shadow:mountpoint = $shadow_mntdir
+       shadow:snapdir = $shadow_tstdir/.snapshots
+       shadow:snapsharepath = share
+
+[shadow_wl]
+       path = $shadow_shrdir
+       comment = previous versions with wide links allowed
+       vfs objects = shadow_copy2
+       shadow:mountpoint = $shadow_mntdir
+       wide links = yes
        ";
        close(CONF);
 
@@ -794,27 +1637,70 @@ sub provision($$$$$$)
        ## create a test account
        ##
 
-       open(PASSWD, ">$nss_wrapper_passwd") or die("Unable to open $nss_wrapper_passwd");
+       unless (open(PASSWD, ">$nss_wrapper_passwd")) {
+           warn("Unable to open $nss_wrapper_passwd");
+           return undef;
+        } 
        print PASSWD "nobody:x:$uid_nobody:$gid_nobody:nobody gecos:$prefix_abs:/bin/false
 $unix_name:x:$unix_uid:$unix_gids[0]:$unix_name gecos:$prefix_abs:/bin/false
+pdbtest:x:$uid_pdbtest:$gid_nogroup:pdbtest gecos:$prefix_abs:/bin/false
+pdbtest2:x:$uid_pdbtest2:$gid_nogroup:pdbtest gecos:$prefix_abs:/bin/false
+userdup:x:$uid_userdup:$gid_userdup:userdup gecos:$prefix_abs:/bin/false
+pdbtest_wkn:x:$uid_pdbtest_wkn:$gid_everyone:pdbtest_wkn gecos:$prefix_abs:/bin/false
 ";
        if ($unix_uid != 0) {
-               print PASSWD "root:x:$uid_root:$gid_root:root gecos:$prefix_abs:/bin/false";
+               print PASSWD "root:x:$uid_root:$gid_root:root gecos:$prefix_abs:/bin/false
+";
        }
        close(PASSWD);
 
-       open(GROUP, ">$nss_wrapper_group") or die("Unable to open $nss_wrapper_group");
+       unless (open(GROUP, ">$nss_wrapper_group")) {
+             warn("Unable to open $nss_wrapper_group");
+             return undef;
+        }
        print GROUP "nobody:x:$gid_nobody:
 nogroup:x:$gid_nogroup:nobody
 $unix_name-group:x:$unix_gids[0]:
 domusers:X:$gid_domusers:
+domadmins:X:$gid_domadmins:
+userdup:x:$gid_userdup:$unix_name
+everyone:x:$gid_everyone:
 ";
        if ($unix_gids[0] != 0) {
-               print GROUP "root:x:$gid_root:";
+               print GROUP "root:x:$gid_root:
+";
        }
 
        close(GROUP);
 
+       ## hosts
+       my $hostname = lc($server);
+       unless (open(HOSTS, ">>$nss_wrapper_hosts")) {
+               warn("Unable to open $nss_wrapper_hosts");
+               return undef;
+       }
+       print HOSTS "${server_ip} ${hostname}.samba.example.com ${hostname}\n";
+       print HOSTS "${server_ipv6} ${hostname}.samba.example.com ${hostname}\n";
+       close(HOSTS);
+
+       ## hosts
+       unless (open(RESOLV_CONF, ">$resolv_conf")) {
+               warn("Unable to open $resolv_conf");
+               return undef;
+       }
+       if (defined($dc_server_ip) or defined($dc_server_ipv6)) {
+               if (defined($dc_server_ip)) {
+                       print RESOLV_CONF "nameserver $dc_server_ip\n";
+               }
+               if (defined($dc_server_ipv6)) {
+                       print RESOLV_CONF "nameserver $dc_server_ipv6\n";
+               }
+       } else {
+               print RESOLV_CONF "nameserver ${server_ip}\n";
+               print RESOLV_CONF "nameserver ${server_ipv6}\n";
+       }
+       close(RESOLV_CONF);
+
        foreach my $evlog (@eventlog_list) {
                my $evlogtdb = "$eventlogdir/$evlog.tdb";
                open(EVENTLOG, ">$evlogtdb") or die("Unable to open $evlogtdb");
@@ -823,19 +1709,33 @@ domusers:X:$gid_domusers:
 
        $ENV{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd;
        $ENV{NSS_WRAPPER_GROUP} = $nss_wrapper_group;
+       $ENV{NSS_WRAPPER_HOSTS} = $nss_wrapper_hosts;
+       $ENV{NSS_WRAPPER_HOSTNAME} = "${hostname}.samba.example.com";
+       if ($ENV{SAMBA_DNS_FAKING}) {
+               $ENV{RESOLV_WRAPPER_CONF} = $resolv_conf;
+       } else {
+               $ENV{RESOLV_WRAPPER_HOSTS} = $dns_host_file;
+       }
 
-       open(PWD, "|".$self->binpath("smbpasswd")." -c $conffile -L -s -a $unix_name >/dev/null");
+        my $cmd = "UID_WRAPPER_ROOT=1 " . Samba::bindir_path($self, "smbpasswd")." -c $conffile -L -s -a $unix_name > /dev/null";
+       unless (open(PWD, "|$cmd")) {
+             warn("Unable to set password for test account\n$cmd");
+             return undef;
+        }
        print PWD "$password\n$password\n";
-       close(PWD) or die("Unable to set password for test account");
-
+       unless (close(PWD)) {
+             warn("Unable to set password for test account\n$cmd");
+             return undef; 
+        }
        print "DONE\n";
 
-       open(HOSTS, ">>$ENV{SELFTEST_PREFIX}/dns_host_file") or die("Unable to open $ENV{SELFTEST_PREFIX}/dns_host_file");
-       print HOSTS "A $server. $server_ip
-";
-       close(HOSTS);
+       open(DNS_UPDATE_LIST, ">$prefix/dns_update_list") or die("Unable to open $$prefix/dns_update_list");
+       print DNS_UPDATE_LIST "A $server. $server_ip\n";
+       print DNS_UPDATE_LIST "AAAA $server. $server_ipv6\n";
+       close(DNS_UPDATE_LIST);
 
        $ret{SERVER_IP} = $server_ip;
+       $ret{SERVER_IPV6} = $server_ipv6;
        $ret{NMBD_TEST_LOG} = "$prefix/nmbd_test.log";
        $ret{NMBD_TEST_LOG_POS} = 0;
        $ret{WINBINDD_TEST_LOG} = "$prefix/winbindd_test.log";
@@ -851,54 +1751,140 @@ domusers:X:$gid_domusers:
        $ret{NETBIOSNAME} = $server;
        $ret{PASSWORD} = $password;
        $ret{PIDDIR} = $piddir;
-       $ret{WINBINDD_SOCKET_DIR} = $wbsockdir;
+       $ret{SELFTEST_WINBINDD_SOCKET_DIR} = $wbsockdir;
        $ret{WINBINDD_PRIV_PIPE_DIR} = $wbsockprivdir;
        $ret{NMBD_SOCKET_DIR} = $nmbdsockdir;
        $ret{SOCKET_WRAPPER_DEFAULT_IFACE} = $swiface;
        $ret{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd;
        $ret{NSS_WRAPPER_GROUP} = $nss_wrapper_group;
-       $ret{NSS_WRAPPER_WINBIND_SO_PATH} = $ENV{NSS_WRAPPER_WINBIND_SO_PATH};
+       $ret{NSS_WRAPPER_HOSTS} = $nss_wrapper_hosts;
+       $ret{NSS_WRAPPER_HOSTNAME} = "${hostname}.samba.example.com";
+       $ret{NSS_WRAPPER_MODULE_SO_PATH} = Samba::nss_wrapper_winbind_so_path($self);
+       $ret{NSS_WRAPPER_MODULE_FN_PREFIX} = "winbind";
+       if ($ENV{SAMBA_DNS_FAKING}) {
+               $ret{RESOLV_WRAPPER_HOSTS} = $dns_host_file;
+       } else {
+               $ret{RESOLV_WRAPPER_CONF} = $resolv_conf;
+       }
        $ret{LOCAL_PATH} = "$shrdir";
+        $ret{LOGDIR} = $logdir;
+
+       #
+       # Avoid hitting system krb5.conf -
+       # An env that needs Kerberos will reset this to the real
+       # value.
+       #
+       $ret{KRB5_CONFIG} = abs_path($prefix) . "/no_krb5.conf";
 
        return \%ret;
 }
 
-sub wait_for_start($$)
+sub wait_for_start($$$$$)
 {
-       my ($self, $envvars) = @_;
+       my ($self, $envvars, $nmbd, $winbindd, $smbd) = @_;
+       my $ret;
 
-       # give time for nbt server to register its names
-       print "delaying for nbt name registration\n";
-       sleep(10);
-       # This will return quickly when things are up, but be slow if we need to wait for (eg) SSL init 
-       system($self->binpath("nmblookup") ." $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} __SAMBA__");
-       system($self->binpath("nmblookup") ." $envvars->{CONFIGURATION} __SAMBA__");
-       system($self->binpath("nmblookup") ." $envvars->{CONFIGURATION} -U 127.255.255.255 __SAMBA__");
-       system($self->binpath("nmblookup") ." $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} $envvars->{SERVER}");
-       system($self->binpath("nmblookup") ." $envvars->{CONFIGURATION} $envvars->{SERVER}");
+       if ($nmbd eq "yes") {
+               my $count = 0;
 
-       # make sure smbd is also up set
-       print "wait for smbd\n";
+               # give time for nbt server to register its names
+               print "checking for nmbd\n";
 
-       my $count = 0;
-       my $ret;
-       do {
-           $ret = system($self->binpath("smbclient") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER} -U% -p 139");
-           if ($ret != 0) {
-               sleep(2);
+               # 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");
+
+               do {
+                       $ret = system("$nmblookup $envvars->{CONFIGURATION} $envvars->{SERVER}");
+                       if ($ret != 0) {
+                               sleep(1);
+                       } else {
+                               system("$nmblookup $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} __SAMBA__");
+                               system("$nmblookup $envvars->{CONFIGURATION} __SAMBA__");
+                               system("$nmblookup $envvars->{CONFIGURATION} -U 127.255.255.255 __SAMBA__");
+                               system("$nmblookup $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} $envvars->{SERVER}");
+                       }
+                       $count++;
+               } while ($ret != 0 && $count < 10);
+               if ($count == 10) {
+                       print "NMBD not reachable after 10 retries\n";
+                       teardown_env($self, $envvars);
+                       return 0;
+               }
+       }
+
+       if ($winbindd eq "yes") {
+           print "checking for winbindd\n";
+           my $count = 0;
+           do {
+               $ret = system("SELFTEST_WINBINDD_SOCKET_DIR=" . $envvars->{SELFTEST_WINBINDD_SOCKET_DIR} . " " . Samba::bindir_path($self, "wbinfo") . " --ping-dc");
+               if ($ret != 0) {
+                   sleep(2);
+               }
+               $count++;
+           } while ($ret != 0 && $count < 10);
+           if ($count == 10) {
+               print "WINBINDD not reachable after 20 seconds\n";
+               teardown_env($self, $envvars);
+               return 0;
+           }
+       }
+
+       if ($smbd eq "yes") {
+           # make sure smbd is also up set
+           print "wait for smbd\n";
+
+           my $count = 0;
+           do {
+               $ret = system(Samba::bindir_path($self, "smbclient") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER} -U% -p 139");
+               if ($ret != 0) {
+                   sleep(2);
+               }
+               $count++
+           } while ($ret != 0 && $count < 10);
+           if ($count == 10) {
+               print "SMBD failed to start up in a reasonable time (20sec)\n";
+               teardown_env($self, $envvars);
+               return 0;
            }
-           $count++
-       } while ($ret != 0 && $count < 10);
-       if ($count == 10) {
-           print "SMBD failed to start up in a reasonable time (20sec)\n";
-           teardown_env($self, $envvars);
-           return 0;
        }
+
        # Ensure we have domain users mapped.
-       $ret = system($self->binpath("net") ." $envvars->{CONFIGURATION} groupmap add rid=513 unixgroup=domusers type=domain");
+       $ret = system(Samba::bindir_path($self, "net") ." $envvars->{CONFIGURATION} groupmap add rid=513 unixgroup=domusers type=domain");
+       if ($ret != 0) {
+           return 1;
+       }
+       $ret = system(Samba::bindir_path($self, "net") ." $envvars->{CONFIGURATION} groupmap add rid=512 unixgroup=domadmins type=domain");
        if ($ret != 0) {
            return 1;
        }
+       $ret = system(Samba::bindir_path($self, "net") ." $envvars->{CONFIGURATION} groupmap add sid=S-1-1-0 unixgroup=everyone type=builtin");
+       if ($ret != 0) {
+           return 1;
+       }
+
+       if ($winbindd eq "yes") {
+           # note: creating builtin groups requires winbindd for the
+           # unix id allocator
+           $ret = system("SELFTEST_WINBINDD_SOCKET_DIR=" . $envvars->{SELFTEST_WINBINDD_SOCKET_DIR} . " " . Samba::bindir_path($self, "net") ." $envvars->{CONFIGURATION} sam createbuiltingroup Users");
+           if ($ret != 0) {
+               print "Failed to create BUILTIN\\Users group\n";
+               return 0;
+           }
+           my $count = 0;
+           do {
+               system(Samba::bindir_path($self, "net") . " $envvars->{CONFIGURATION} cache flush");
+               $ret = system("SELFTEST_WINBINDD_SOCKET_DIR=" . $envvars->{SELFTEST_WINBINDD_SOCKET_DIR} . " " . Samba::bindir_path($self, "wbinfo") . " --sid-to-gid=S-1-5-32-545");
+               if ($ret != 0) {
+                   sleep(2);
+               }
+               $count++;
+           } while ($ret != 0 && $count < 10);
+           if ($count == 10) {
+               print "WINBINDD not reachable after 20 seconds\n";
+               teardown_env($self, $envvars);
+               return 0;
+           }
+       }
 
        print $self->getlog_env($envvars);