libcli/dns Improve dns_hosts_file, using Samba3's struct dns_rr_srv
[obnox/samba/samba-obnox.git] / selftest / target / Samba3.pm
index 3c64e8daa4a7e9bc8a3d4448caa12ce675e7c234..a829b097974377b631a1ebcb4015aeec925abf41 100644 (file)
@@ -10,22 +10,17 @@ use Cwd qw(abs_path);
 use FindBin qw($RealBin);
 use POSIX;
 
-sub binpath($$)
-{
-       my ($self, $binary) = @_;
-
-       if (defined($self->{bindir})) {
-               my $path = "$self->{bindir}/$binary";
-               -f $path or die("File $path doesn't exist");
-               return $path;
-       }
-
-       return $binary;
-}
-
 sub new($$) {
-       my ($classname, $bindir) = @_;
-       my $self = { bindir => $bindir };
+       my ($classname, $bindir, $binary_mapping, $bindir_path, $srcdir, $exeext, $server_maxtime) = @_;
+       $exeext = "" unless defined($exeext);
+       my $self = { vars => {},
+                    bindir => $bindir,
+                    binary_mapping => $binary_mapping,
+                    bindir_path => $bindir_path,
+                    srcdir => $srcdir,
+                    exeext => $exeext,
+                    server_maxtime => $server_maxtime
+       };
        bless $self;
        return $self;
 }
@@ -96,50 +91,72 @@ sub setup_env($$$)
 {
        my ($self, $envname, $path) = @_;
        
-       if ($envname eq "dc") {
-               return $self->setup_dc("$path/dc");
+       if ($envname eq "s3dc") {
+               return $self->setup_s3dc("$path/s3dc");
+       } elsif ($envname eq "secshare") {
+               return $self->setup_secshare("$path/secshare");
+       } elsif ($envname eq "ktest") {
+               return $self->setup_ktest("$path/ktest");
+       } elsif ($envname eq "secserver") {
+               if (not defined($self->{vars}->{s3dc})) {
+                       if (not defined($self->setup_s3dc("$path/s3dc"))) {
+                               return undef;
+                       }
+               }
+               return $self->setup_secserver("$path/secserver", $self->{vars}->{s3dc});
        } elsif ($envname eq "member") {
-               if (not defined($self->{vars}->{dc})) {
-                       $self->setup_dc("$path/dc");
+               if (not defined($self->{vars}->{s3dc})) {
+                       if (not defined($self->setup_s3dc("$path/s3dc"))) {
+                               return undef;
+                       }
                }
-               return $self->setup_member("$path/member", $self->{vars}->{dc});
+               return $self->setup_member("$path/member", $self->{vars}->{s3dc});
        } else {
                return undef;
        }
 }
 
-sub setup_dc($$)
+sub setup_s3dc($$)
 {
        my ($self, $path) = @_;
 
-       print "PROVISIONING DC...";
+       print "PROVISIONING S3DC...";
 
-       my $dc_options = "
+       my $s3dc_options = "
        domain master = yes
        domain logons = yes
        lanman auth = yes
 ";
 
        my $vars = $self->provision($path,
-                                   "LOCALDC2",
+                                   "LOCALS3DC2",
                                    2,
-                                   "localdc2pass",
-                                   $dc_options);
+                                   "locals3dc2pass",
+                                   $s3dc_options);
+
+       $vars or return undef;
 
        $self->check_or_start($vars,
-                             ($ENV{SMBD_MAXTIME} or 2700),
                               "yes", "yes", "yes");
 
-       $self->wait_for_start($vars);
+       if (not $self->wait_for_start($vars)) {
+              return undef;
+       }
+
+       $vars->{DC_SERVER} = $vars->{SERVER};
+       $vars->{DC_SERVER_IP} = $vars->{SERVER_IP};
+       $vars->{DC_NETBIOSNAME} = $vars->{NETBIOSNAME};
+       $vars->{DC_USERNAME} = $vars->{USERNAME};
+       $vars->{DC_PASSWORD} = $vars->{PASSWORD};
 
-       $self->{vars}->{dc} = $vars;
+       $self->{vars}->{s3dc} = $vars;
 
        return $vars;
 }
 
 sub setup_member($$$)
 {
-       my ($self, $prefix, $dcvars) = @_;
+       my ($self, $prefix, $s3dcvars) = @_;
 
        print "PROVISIONING MEMBER...";
 
@@ -153,34 +170,166 @@ sub setup_member($$$)
                                   "localmember3pass",
                                   $member_options);
 
-       $ret or die("Unable to provision");
+       $ret or return undef;
 
-       my $net = $self->binpath("net");
+       my $net = $self->{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 .= " -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}";
+       $cmd .= "$net join $ret->{CONFIGURATION} $s3dcvars->{DOMAIN} member";
+       $cmd .= " -U$s3dcvars->{USERNAME}\%$s3dcvars->{PASSWORD}";
 
        system($cmd) == 0 or die("Join failed\n$cmd");
 
-       $self->check_or_start($ret,
-                             ($ENV{SMBD_MAXTIME} or 2700),
-                              "yes", "yes", "yes");
+       $self->check_or_start($ret, "yes", "yes", "yes");
+
+       if (not $self->wait_for_start($ret)) {
+              return undef;
+       }
+
+       $ret->{DC_SERVER} = $s3dcvars->{SERVER};
+       $ret->{DC_SERVER_IP} = $s3dcvars->{SERVER_IP};
+       $ret->{DC_NETBIOSNAME} = $s3dcvars->{NETBIOSNAME};
+       $ret->{DC_USERNAME} = $s3dcvars->{USERNAME};
+       $ret->{DC_PASSWORD} = $s3dcvars->{PASSWORD};
+
+       return $ret;
+}
+
+sub setup_secshare($$)
+{
+       my ($self, $path) = @_;
+
+       print "PROVISIONING server with security=share...";
+
+       my $secshare_options = "
+       security = share
+       lanman auth = yes
+";
+
+       my $vars = $self->provision($path,
+                                   "LOCALSHARE4",
+                                   4,
+                                   "local4pass",
+                                   $secshare_options);
+
+       $vars or return undef;
+
+       $self->check_or_start($vars, "yes", "no", "yes");
+
+       if (not $self->wait_for_start($vars)) {
+              return undef;
+       }
+
+       $self->{vars}->{secshare} = $vars;
+
+       return $vars;
+}
+
+sub setup_secserver($$$)
+{
+       my ($self, $prefix, $s3dcvars) = @_;
 
-       $self->wait_for_start($ret);
+       print "PROVISIONING server with security=server...";
 
-       $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};
+       my $secserver_options = "
+       security = server
+        password server = $s3dcvars->{SERVER_IP}
+";
+
+       my $ret = $self->provision($prefix,
+                                  "LOCALSERVER5",
+                                  5,
+                                  "localserver5pass",
+                                  $secserver_options);
+
+       $ret or return undef;
+
+       $self->check_or_start($ret, "yes", "no", "yes");
+
+       if (not $self->wait_for_start($ret)) {
+              return undef;
+       }
+
+       $ret->{DC_SERVER} = $s3dcvars->{SERVER};
+       $ret->{DC_SERVER_IP} = $s3dcvars->{SERVER_IP};
+       $ret->{DC_NETBIOSNAME} = $s3dcvars->{NETBIOSNAME};
+       $ret->{DC_USERNAME} = $s3dcvars->{USERNAME};
+       $ret->{DC_PASSWORD} = $s3dcvars->{PASSWORD};
 
        return $ret;
 }
 
-sub stop($)
+sub setup_ktest($$$)
 {
-       my ($self) = @_;
+       my ($self, $prefix, $s3dcvars) = @_;
+
+       print "PROVISIONING server with security=ads...";
+
+       my $ktest_options = "
+        workgroup = KTEST
+        realm = ktest.samba.example.com
+       security = ads
+        username map = $prefix/lib/username.map
+";
+
+       my $ret = $self->provision($prefix,
+                                  "LOCALKTEST6",
+                                  6,
+                                  "localktest6pass",
+                                  $ktest_options);
+
+       $ret or return undef;
+
+       open(USERMAP, ">$prefix/lib/username.map") or die("Unable to open $prefix/lib/username.map");
+       print USERMAP "
+$ret->{USERNAME} = KTEST\\Administrator
+";
+       close(USERMAP);
+
+#This is the secrets.tdb created by 'net ads join' from Samba3 to a
+#Samba4 DC with the same parameters as are being used here.  The
+#domain SID is S-1-5-21-1071277805-689288055-3486227160
+
+       system("cp $self->{srcdir}/source3/selftest/ktest-secrets.tdb $prefix/private/secrets.tdb");
+       chmod 0600, "$prefix/private/secrets.tdb";
+
+#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"
+#
+#and having in krb5.conf:
+# ticket_lifetime = 799718400
+# renew_lifetime = 799718400
+#
+# The commands for the -2 keytab where were:
+# kinit administrator@KTEST.SAMBA.EXAMPLE.COM
+# kvno host/localktest6@KTEST.SAMBA.EXAMPLE.COM
+# kvno cifs/localktest6@KTEST.SAMBA.EXAMPLE.COM
+# kvno host/LOCALKTEST6@KTEST.SAMBA.EXAMPLE.COM
+# kvno cifs/LOCALKTEST6@KTEST.SAMBA.EXAMPLE.COM
+#
+# and then for the -3 keytab, I did
+#
+# net changetrustpw; kdestroy and the same again.
+#
+# This creates a credential cache with a very long lifetime (2036 at
+# at 2011-04), and shows that running 'net changetrustpw' does not
+# break existing logins (for the secrets.tdb method at least).
+#
+
+       $ret->{KRB5_CCACHE}="FILE:$prefix/krb5_ccache";
+
+       system("cp $self->{srcdir}/source3/selftest/ktest-krb5_ccache-2 $prefix/krb5_ccache-2");
+       chmod 0600, "$prefix/krb5_ccache-2";
+
+       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, "yes", "no", "yes");
+
+       if (not $self->wait_for_start($ret)) {
+              return undef;
+       }
+       return $ret;
 }
 
 sub stop_sig_term($$) {
@@ -212,8 +361,8 @@ sub read_pid($$)
        return $pid;
 }
 
-sub check_or_start($$$$$) {
-       my ($self, $env_vars, $maxtime, $nmbd, $winbindd, $smbd) = @_;
+sub check_or_start($$$$) {
+       my ($self, $env_vars, $nmbd, $winbindd, $smbd) = @_;
 
        unlink($env_vars->{NMBD_TEST_LOG});
        print "STARTING NMBD...";
@@ -225,6 +374,7 @@ sub check_or_start($$$$$) {
                SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
 
                $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+               $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
 
                $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
@@ -236,7 +386,7 @@ sub check_or_start($$$$$) {
                                print("Skip nmbd received signal $signame");
                                exit 0;
                        };
-                       sleep($maxtime);
+                       sleep($self->{server_maxtime});
                        exit 0;
                }
 
@@ -245,14 +395,14 @@ sub check_or_start($$$$$) {
                        @optargs = split(/ /, $ENV{NMBD_OPTIONS});
                }
 
-               $ENV{MAKE_TEST_BINARY} = $self->binpath("nmbd");
+               $ENV{MAKE_TEST_BINARY} = $self->{bindir_path}->($self, "nmbd");
 
-               my @preargs = ($self->binpath("timelimit"), $maxtime);
+               my @preargs = ($self->{bindir_path}->($self, "timelimit"), $self->{server_maxtime});
                if(defined($ENV{NMBD_VALGRIND})) { 
                        @preargs = split(/ /, $ENV{NMBD_VALGRIND});
                }
 
-               exec(@preargs, $self->binpath("nmbd"), "-F", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start nmbd: $!");
+               exec(@preargs, $self->{bindir_path}->($self, "nmbd"), "-F", "--no-process-group", "-S", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start nmbd: $!");
        }
        write_pid($env_vars, "nmbd", $pid);
        print "DONE\n";
@@ -267,6 +417,7 @@ sub check_or_start($$$$$) {
                SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
 
                $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+               $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
 
                $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
@@ -278,7 +429,7 @@ sub check_or_start($$$$$) {
                                print("Skip winbindd received signal $signame");
                                exit 0;
                        };
-                       sleep($maxtime);
+                       sleep($self->{server_maxtime});
                        exit 0;
                }
 
@@ -287,14 +438,14 @@ sub check_or_start($$$$$) {
                        @optargs = split(/ /, $ENV{WINBINDD_OPTIONS});
                }
 
-               $ENV{MAKE_TEST_BINARY} = $self->binpath("winbindd");
+               $ENV{MAKE_TEST_BINARY} = $self->{bindir_path}->($self, "winbindd");
 
-               my @preargs = ($self->binpath("timelimit"), $maxtime);
+               my @preargs = ($self->{bindir_path}->($self, "timelimit"), $self->{server_maxtime});
                if(defined($ENV{WINBINDD_VALGRIND})) {
                        @preargs = split(/ /, $ENV{WINBINDD_VALGRIND});
                }
 
-               exec(@preargs, $self->binpath("winbindd"), "-F", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start winbindd: $!");
+               exec(@preargs, $self->{bindir_path}->($self, "winbindd"), "-F", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start winbindd: $!");
        }
        write_pid($env_vars, "winbindd", $pid);
        print "DONE\n";
@@ -309,6 +460,7 @@ sub check_or_start($$$$$) {
                SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
 
                $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+               $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
 
                $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
@@ -320,20 +472,20 @@ 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} = $self->{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 = ($self->{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: $!");
+               exec(@preargs, $self->{bindir_path}->($self, "smbd"), "-F", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start smbd: $!");
        }
        write_pid($env_vars, "smbd", $pid);
        print "DONE\n";
@@ -361,6 +513,9 @@ 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 $dns_host_file = "$ENV{SELFTEST_PREFIX}/dns_host_file";
 
        my @dirs = ();
 
@@ -391,6 +546,9 @@ sub provision($$$$$$)
        my $driver64dir="$shrdir/x64";
        push(@dirs,$driver64dir);
 
+       my $driver40dir="$shrdir/WIN40";
+       push(@dirs,$driver40dir);
+
        my $ro_shrdir="$shrdir/root-tmp";
        push(@dirs,$ro_shrdir);
 
@@ -404,6 +562,9 @@ sub provision($$$$$$)
        my $wbsockdir="$prefix_abs/winbindd";
        my $wbsockprivdir="$lockdir/winbindd_privileged";
 
+       my $nmbdsockdir="$prefix_abs/nmbd";
+       unlink($nmbdsockdir);
+
        ## 
        ## create the test directory layout
        ##
@@ -434,11 +595,11 @@ sub provision($$$$$$)
 
        my $conffile="$libdir/server.conf";
 
-       my $nss_wrapper_pl = "$ENV{PERL} $RealBin/../lib/nss_wrapper/nss_wrapper.pl";
+       my $nss_wrapper_pl = "$ENV{PERL} $self->{srcdir}/lib/nss_wrapper/nss_wrapper.pl";
        my $nss_wrapper_passwd = "$privatedir/passwd";
        my $nss_wrapper_group = "$privatedir/group";
 
-       my $mod_printer_pl = "$ENV{PERL} $RealBin/../source3/script/tests/printing/modprinter.pl";
+       my $mod_printer_pl = "$ENV{PERL} $self->{srcdir}/source3/script/tests/printing/modprinter.pl";
 
        my @eventlog_list = ("dns server", "application");
 
@@ -448,7 +609,7 @@ sub provision($$$$$$)
 
        my ($max_uid, $max_gid);
        my ($uid_nobody, $uid_root);
-       my ($gid_nobody, $gid_nogroup, $gid_root);
+       my ($gid_nobody, $gid_nogroup, $gid_root, $gid_domusers);
 
        if ($unix_uid < 0xffff - 2) {
                $max_uid = 0xffff;
@@ -468,6 +629,7 @@ sub provision($$$$$$)
        $gid_nobody = $max_gid - 1;
        $gid_nogroup = $max_gid - 2;
        $gid_root = $max_gid - 3;
+       $gid_domusers = $max_gid - 4;
 
        ##
        ## create conffile
@@ -479,7 +641,7 @@ sub provision($$$$$$)
        netbios name = $server
        interfaces = $server_ip/8
        bind interfaces only = yes
-       panic action = $RealBin/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
+       panic action = $self->{srcdir}/selftest/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
 
        workgroup = $domain
 
@@ -488,6 +650,8 @@ sub provision($$$$$$)
        lock directory = $lockdir
        log file = $logdir/log.\%m
        log level = 0
+       debug pid = yes
+        max log size = 0
 
        name resolve order = bcast
 
@@ -519,14 +683,17 @@ sub provision($$$$$$)
        printcap name = /dev/null
 
        winbindd:socket dir = $wbsockdir
-       idmap uid = 100000-200000
-       idmap gid = 100000-200000
+       nmbd:socket dir = $nmbdsockdir
+       idmap config * : range = 100000-200000
        winbind enum users = yes
        winbind enum groups = yes
 
 #      min receivefile size = 4000
 
+       max protocol = SMB2
        read only = no
+       server signing = auto
+
        smbd:sharedelay = 100000
 #      smbd:writetimeupdatedelay = 500000
        map hidden = no
@@ -534,7 +701,7 @@ sub provision($$$$$$)
        map readonly = no
        store dos attributes = yes
        create mask = 755
-       vfs objects = $bindir_abs/xattr_tdb.so $bindir_abs/streams_depot.so
+       vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
 
        printing = vlp
        print command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb print %p %s
@@ -546,6 +713,11 @@ sub provision($$$$$$)
        queue resume command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb queueresume %p
        lpq cache time = 0
 
+       ncalrpc dir = $lockdir/ncalrpc
+       rpc_server:epmapper = embedded
+
+        resolv:host file = $dns_host_file
+
        # Begin extra options
        $extra_options
        # End extra options
@@ -560,6 +732,21 @@ sub provision($$$$$$)
        print CONF "
 [tmp]
        path = $shrdir
+[tmpguest]
+       path = $shrdir
+        guest ok = yes
+[guestonly]
+       path = $shrdir
+        guest only = yes
+        guest ok = yes
+[forceuser]
+       path = $shrdir
+        force user = $unix_name
+        guest ok = yes
+[forcegroup]
+       path = $shrdir
+        force group = nogroup
+        guest ok = yes
 [ro-tmp]
        path = $ro_shrdir
        guest ok = yes
@@ -584,7 +771,7 @@ sub provision($$$$$$)
        copy = print1
 [print3]
        copy = print1
-[print4]
+[lp]
        copy = print1
 [print\$]
        copy = tmp
@@ -608,6 +795,7 @@ $unix_name:x:$unix_uid:$unix_gids[0]:$unix_name gecos:$prefix_abs:/bin/false
        print GROUP "nobody:x:$gid_nobody:
 nogroup:x:$gid_nogroup:nobody
 $unix_name-group:x:$unix_gids[0]:
+domusers:X:$gid_domusers:
 ";
        if ($unix_gids[0] != 0) {
                print GROUP "root:x:$gid_root:";
@@ -624,12 +812,17 @@ $unix_name-group:x:$unix_gids[0]:
        $ENV{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd;
        $ENV{NSS_WRAPPER_GROUP} = $nss_wrapper_group;
 
-       open(PWD, "|".$self->binpath("smbpasswd")." -c $conffile -L -s -a $unix_name >/dev/null");
+       open(PWD, "|".$self->{bindir_path}->($self, "smbpasswd")." -c $conffile -L -s -a $unix_name >/dev/null");
        print PWD "$password\n$password\n";
        close(PWD) or die("Unable to set password for test account");
 
        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);
+
        $ret{SERVER_IP} = $server_ip;
        $ret{NMBD_TEST_LOG} = "$prefix/nmbd_test.log";
        $ret{NMBD_TEST_LOG_POS} = 0;
@@ -648,10 +841,14 @@ $unix_name-group:x:$unix_gids[0]:
        $ret{PIDDIR} = $piddir;
        $ret{WINBINDD_SOCKET_DIR} = $wbsockdir;
        $ret{WINBINDD_PRIV_PIPE_DIR} = $wbsockprivdir;
+       $ret{NMBD_SOCKET_DIR} = $nmbdsockdir;
        $ret{SOCKET_WRAPPER_DEFAULT_IFACE} = $swiface;
        $ret{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd;
        $ret{NSS_WRAPPER_GROUP} = $nss_wrapper_group;
        $ret{NSS_WRAPPER_WINBIND_SO_PATH} = $ENV{NSS_WRAPPER_WINBIND_SO_PATH};
+        if (not defined($ret{NSS_WRAPPER_WINBIND_SO_PATH})) {
+               $ret{NSS_WRAPPER_WINBIND_SO_PATH} = $self->{bindir_path}->($self, "default/nsswitch/libnss-winbind.so");
+        }
        $ret{LOCAL_PATH} = "$shrdir";
 
        return \%ret;
@@ -665,17 +862,38 @@ sub wait_for_start($$)
        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}");
+       system($self->{bindir_path}->($self, "nmblookup3") ." $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} __SAMBA__");
+       system($self->{bindir_path}->($self, "nmblookup3") ." $envvars->{CONFIGURATION} __SAMBA__");
+       system($self->{bindir_path}->($self, "nmblookup3") ." $envvars->{CONFIGURATION} -U 127.255.255.255 __SAMBA__");
+       system($self->{bindir_path}->($self, "nmblookup3") ." $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} $envvars->{SERVER}");
+       system($self->{bindir_path}->($self, "nmblookup3") ." $envvars->{CONFIGURATION} $envvars->{SERVER}");
+
        # make sure smbd is also up set
        print "wait for smbd\n";
-       system($self->binpath("smbclient") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER_IP} -U% -p 139 | head -2");
-       system($self->binpath("smbclient") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER_IP} -U% -p 139 | head -2");
+
+       my $count = 0;
+       my $ret;
+       do {
+           $ret = system($self->{bindir_path}->($self, "smbclient3") ." $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;
+       }
+       # Ensure we have domain users mapped.
+       $ret = system($self->{bindir_path}->($self, "net") ." $envvars->{CONFIGURATION} groupmap add rid=513 unixgroup=domusers type=domain");
+       if ($ret != 0) {
+           return 1;
+       }
 
        print $self->getlog_env($envvars);
+
+       return 1;
 }
 
 1;