selftest: Remove invalid security=share and rename secshare to simpleserver

This avoids the loadparm code failing due to the invalid smb.conf entry, and removes
the very last hint of security=share!

Andrew Bartlett

2 files changed, 9 insertions, 10 deletions

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index c1f8fbd3c0..ef22b02865 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -153,8 +153,8 @@ sub setup_env($$$)
 
 	if ($envname eq "s3dc") {
 		return $self->setup_s3dc("$path/s3dc");
-	} elsif ($envname eq "secshare") {
-		return $self->setup_secshare("$path/secshare");
+	} elsif ($envname eq "simpleserver") {
+		return $self->setup_simpleserver("$path/simpleserver");
 	} elsif ($envname eq "maptoguest") {
 		return $self->setup_maptoguest("$path/maptoguest");
 	} elsif ($envname eq "ktest") {
@@ -337,7 +337,7 @@ sub setup_admember($$$$)
 	return $ret;
 }
 
-sub setup_secshare($$)
+sub setup_simpleserver($$)
 {
 	my ($self, $path) = @_;
 	my $vfs_modulesdir_abs = $ENV{VFSLIBDIR};
@@ -346,8 +346,7 @@ sub setup_secshare($$)
 
 	my $prefix_abs = abs_path($path);
 
-	my $secshare_options = "
-	security = share
+	my $simpleserver_options = "
 	lanman auth = yes
 	vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
 
@@ -361,7 +360,7 @@ sub setup_secshare($$)
 	my $vars = $self->provision($path,
 				    "LOCALSHARE4",
 				    "local4pass",
-				    $secshare_options);
+				    $simpleserver_options);
 
 	$vars or return undef;
 
@@ -371,7 +370,7 @@ sub setup_secshare($$)
 	       return undef;
 	}
 
-	$self->{vars}->{secshare} = $vars;
+	$self->{vars}->{simpleserver} = $vars;
 
 	return $vars;
 }
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index f4a0d54e03..b07b69086c 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -104,7 +104,7 @@ for t in tests:
 
 tests = ["RW1", "RW2", "RW3"]
 for t in tests:
-    plantestsuite("samba3.smbtorture_s3.vfs_aio_fork(secshare).%s" % t, "secshare", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/vfs_aio_fork', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])
+    plantestsuite("samba3.smbtorture_s3.vfs_aio_fork(simpleserver).%s" % t, "simpleserver", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/vfs_aio_fork', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])
 
 posix_tests=[ "POSIX", "POSIX-APPEND"]
 
@@ -200,7 +200,7 @@ plantestsuite("samba3.ntlm_auth.krb5(ktest:local) old ccache", "ktest:local", [o
 plantestsuite("samba3.ntlm_auth.krb5(ktest:local)", "ktest:local", [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_krb5.sh"), valgrindify(python), samba3srcdir, ntlm_auth, '$PREFIX/ktest/krb5_ccache-3', '$SERVER', configuration])
 
 
-for env in ["maptoguest", "secshare"]:
+for env in ["maptoguest", "simpleserver"]:
     plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) local creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', smbclient, configuration + " --option=clientntlmv2auth=no --option=clientlanmanauth=yes"])
 
 env = "maptoguest"
@@ -343,7 +343,7 @@ for t in tests:
         plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
     elif t == "raw.samba3hide" or t == "raw.samba3checkfsp" or t ==  "raw.samba3closeerr":
         plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
-        plansmbtorturetestsuite(t, "secshare", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
+        plansmbtorturetestsuite(t, "simpleserver", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
         plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
     elif t == "raw.session" or t == "smb2.session":
         plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD', 'plain')