test: create new NTVFSDC environment and remove PLUGINDC

the NTVFSDC environment runs the ntvfs file server. The PLUGINDC
environment is not needed any more, as the s3 file server is the
default

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 411792fb765efa6e9d177e4c9699506d22a03d34..b0f11e537b6d1075e32b3ec8278c49bae725ece9 100644 (file)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1282,25 +1282,20 @@ sub provision_rodc($$$)
        return $ret;
 }
 
-sub provision_plugin_s4_dc($$)
+sub provision_ntvfsdc($$)
 {
        my ($self, $prefix) = @_;
 
        my $extra_smbconf_options = "
-server services = +s3fs -smb
-dcerpc endpoint servers = -unixinfo -rpcecho -spoolss -winreg -wkssvc -srvsvc
-
-[IPC\$]
-       vfs objects = dfs_samba4
-
+server services = +smb -s3fs
 ";
 
-       print "PROVISIONING PLUGIN S4 DC...";
+       print "PROVISIONING NTVFS S4 DC...";
        my $ret = $self->provision($prefix,
                                   "domain controller",
-                                  "plugindc",
-                                  "PLUGINDOMAIN",
-                                  "plugin.samba.example.com",
+                                  "ntvfsdc",
+                                  "NTVFSDOMAIN",
+                                  "ntvfs.samba.example.com",
                                   "2008",
                                   30,
                                   "locDCpass1",
@@ -1430,8 +1425,8 @@ sub setup_env($$$)
                        $self->setup_dc("$path/dc");
                }
                return $target3->setup_admember("$path/s3member", $self->{vars}->{dc}, 29);
-       } elsif ($envname eq "plugin_s4_dc") {
-               return $self->setup_plugin_s4_dc("$path/plugin_s4_dc");
+       } elsif ($envname eq "ntvfsdc") {
+               return $self->setup_ntvfsdc("$path/ntvfsdc");
        } else {
                return undef;
        }
@@ -1658,17 +1653,17 @@ sub setup_rodc($$$)
        return $env;
 }
 
-sub setup_plugin_s4_dc($$)
+sub setup_ntvfsdc($$)
 {
        my ($self, $path) = @_;
 
-       my $env = $self->provision_plugin_s4_dc($path);
+       my $env = $self->provision_ntvfsdc($path);
        if (defined $env) {
                $self->check_or_start($env, "single");
 
                $self->wait_for_start($env);
 
-               $self->{vars}->{plugin_s4_dc} = $env;
+               $self->{vars}->{ntvfsdc} = $env;
        }
        return $env;
 }