selftest: change plugin_dc to test using s3fs
authorAndrew Bartlett <abartlet@samba.org>
Thu, 8 Sep 2011 23:03:23 +0000 (09:03 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 9 Feb 2012 04:41:48 +0000 (15:41 +1100)
selftest/target/Samba3.pm

index b710d5466d7c362ebd74367575320cb0074b93b9..a3ddb1880e3eb2573de6ae073dce077a65e10892 100755 (executable)
@@ -269,79 +269,6 @@ sub setup_admember($$$$)
        return $ret;
 }
 
-sub setup_plugin_s4_dc($$$$)
-{
-       my ($self, $prefix, $dcvars, $iface) = @_;
-
-       print "PROVISIONING S4 PLUGIN AD DC$iface...";
-
-       my $plugin_s4_dc_options = "
-        workgroup = $dcvars->{DOMAIN}
-        realm = $dcvars->{REALM}
-
-        security = ads
-        domain logons = yes
-        passdb backend = samba4
-        auth methods = guest samba4
-        server signing = on
-
-        rpc_server:epmapper = disabled
-        rpc_server:rpcecho = disabled
-        rpc_server:dssetup = disabled
-        rpc_server:svctl = disabled
-        rpc_server:ntsvcs = disabled
-        rpc_server:eventlog = disabled
-        rpc_server:initshutdown = disabled
-
-        rpc_server:winreg = embedded
-        rpc_server:srvsvc = embedded
-        rpc_server:netdfs = embedded
-        rpc_server:wkssvc = embedded
-        rpc_server:spoolss = embedded
-
-        rpc_server:lsarpc = external
-        rpc_server:netlogon = external
-        rpc_server:samr = external
-
-        rpc_daemon:epmd = disabled
-        rpc_daemon:lsasd = disabled
-        rpc_daemon:spoolssd = disabled
-
-        rpc_server:tcpip = no
-
-[IPC\$]
-       vfs objects = dfs_samba4
-";
-
-       my $ret = $self->provision($prefix,
-                                  "plugindc",
-                                  $iface,
-                                  "pluGin${iface}Pass",
-                                  $plugin_s4_dc_options, 1);
-
-       $ret or return undef;
-
-       close(USERMAP);
-       $ret->{DOMAIN} = $dcvars->{DOMAIN};
-       $ret->{REALM} = $dcvars->{REALM};
-       $ret->{KRB5_CONFIG} = $dcvars->{KRB5_CONFIG};
-
-       # 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";
-
-       $self->check_or_start($ret,
-                             "no", "no", "yes");
-
-       $self->wait_for_start($ret);
-
-       # 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($$)
 {
        my ($self, $path) = @_;