Changeset 989 for vendor/current/selftest/target/Samba4.pm

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/selftest/target/Samba4.pm (modified) (5 diffs)

vendor/current/selftest/target/Samba4.pm

@@ -937 +937 @@
 }
 
-sub provision_s4member($$$)
-{
-        my ($self, $prefix, $dcvars) = @_;
-        print "PROVISIONING MEMBER...";
+sub provision_s4member($$$$$)
+{
+        my ($self, $prefix, $dcvars, $hostname, $more_conf) = @_;
+        print "PROVISIONING MEMBER...\n";
         my $extra_smb_conf = "
         passdb backend = samba_dsdb
@@ -955 +955 @@
 rpc_server:tcpip = no
 ";
+        if ($more_conf) {
+                $extra_smb_conf = $extra_smb_conf . $more_conf . "\n";
+        }
         my $ret = $self->provision($prefix,
                                    "member server",
-                                   "s4member",
+                                   $hostname,
                                    "SAMBADOMAIN",
                                    "samba.example.com",
@@ -1894 +1897 @@
                 }
                 return $self->setup_subdom_dc("$path/subdom_dc", $self->{vars}->{ad_dc_ntvfs});
+        } elsif ($envname eq "s4member_dflt_domain") {
+                if (not defined($self->{vars}->{ad_dc_ntvfs})) {
+                        $self->setup_ad_dc_ntvfs("$path/ad_dc_ntvfs");
+                }
+                return $self->setup_s4member_dflt_domain("$path/s4member_dflt_domain", $self->{vars}->{ad_dc_ntvfs});
         } elsif ($envname eq "s4member") {
                 if (not defined($self->{vars}->{ad_dc_ntvfs})) {
@@ -1932 +1940 @@
         my ($self, $path, $dc_vars) = @_;
 
-        my $env = $self->provision_s4member($path, $dc_vars);
+        my $env = $self->provision_s4member($path, $dc_vars, "s4member");
 
         if (defined $env) {
@@ -1940 +1948 @@
 
                 $self->{vars}->{s4member} = $env;
+        }
+
+        return $env;
+}
+
+sub setup_s4member_dflt_domain($$$)
+{
+        my ($self, $path, $dc_vars) = @_;
+
+        my $env = $self->provision_s4member($path, $dc_vars, "s4member_dflt",
+                                            "winbind use default domain = yes");
+
+        if (defined $env) {
+                if (not defined($self->check_or_start($env, "standard"))) {
+                        return undef;
+                }
+
+                $self->{vars}->{s4member_dflt_domain} = $env;
         }