selftest: move all winbind test rules to one place

[samba.git] / selftest / target / Samba4.pm

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 4e7cbd5905885db8d228c4e65b3174cfad21a39a..5ce2e84113224615ff51e1c457491ac650639725 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -654,6 +654,8 @@ sub provision_raw_step1($$)
        server signing = on
 
         idmap_ldb:use rfc2307=yes
+       winbind enum users = yes
+       winbind enum groups = yes
 ";
 
        print CONFFILE "
@@ -916,7 +918,7 @@ $extra_smbconf_shares
        return $self->provision_raw_step2($ctx, $ret);
 }
 
-sub provision_member($$$)
+sub provision_s4member($$$)
 {
        my ($self, $prefix, $dcvars) = @_;
        print "PROVISIONING MEMBER...";
@@ -1321,6 +1323,34 @@ sub provision_fl2003dc($$)
                                   "locDCpass6",
                                   undef, "allow dns updates = nonsecure and secure", "", undef);
 
+       unless (defined $ret) {
+               return undef;
+       }
+
+       $ret->{DC_SERVER} = $ret->{SERVER};
+       $ret->{DC_SERVER_IP} = $ret->{SERVER_IP};
+       $ret->{DC_NETBIOSNAME} = $ret->{NETBIOSNAME};
+       $ret->{DC_USERNAME} = $ret->{USERNAME};
+       $ret->{DC_PASSWORD} = $ret->{PASSWORD};
+
+       my @samba_tool_options;
+       push (@samba_tool_options, Samba::bindir_path($self, "samba-tool"));
+       push (@samba_tool_options, "domain");
+       push (@samba_tool_options, "passwordsettings");
+       push (@samba_tool_options, "set");
+       push (@samba_tool_options, "--configfile=$ret->{SERVERCONFFILE}");
+       push (@samba_tool_options, "--min-pwd-age=0");
+       push (@samba_tool_options, "--history-length=1");
+
+       my $samba_tool_cmd = join(" ", @samba_tool_options);
+
+       unless (system($samba_tool_cmd) == 0) {
+               warn("Unable to set min password age to 0: \n$samba_tool_cmd\n");
+               return undef;
+       }
+
+        return $ret;
+
        unless($self->add_wins_config("$prefix/private")) {
                warn("Unable to add wins configuration");
                return undef;
@@ -1446,6 +1476,8 @@ sub provision_plugin_s4_dc($$)
         server services = -smb +s3fs
         xattr_tdb:file = $prefix_abs/statedir/xattr.tdb
 
+       dbwrap_tdb_mutexes:* = yes
+
        kernel oplocks = no
        kernel change notify = no
 
@@ -1701,7 +1733,7 @@ sub setup_env($$$)
                if (not defined($self->{vars}->{dc})) {
                        $self->setup_dc("$path/dc");
                }
-               return $self->setup_member("$path/s4member", $self->{vars}->{dc});
+               return $self->setup_s4member("$path/s4member", $self->{vars}->{dc});
        } elsif ($envname eq "rodc") {
                if (not defined($self->{vars}->{dc})) {
                        $self->setup_dc("$path/dc");
@@ -1727,18 +1759,18 @@ sub setup_env($$$)
        }
 }
 
-sub setup_member($$$)
+sub setup_s4member($$$)
 {
        my ($self, $path, $dc_vars) = @_;
 
-       my $env = $self->provision_member($path, $dc_vars);
+       my $env = $self->provision_s4member($path, $dc_vars);
 
        if (defined $env) {
                $self->check_or_start($env, "single");
 
                $self->wait_for_start($env);
 
-               $self->{vars}->{member} = $env;
+               $self->{vars}->{s4member} = $env;
        }
 
        return $env;