selftest: Add new test environment fileserver_smb1

fileserver_smb1 is a copy of the fileserver test environment but
with the difference that it still supports SMB1, this will allow
use to still run SMB1 tests.

Signed-off-by: Noel Power <npower@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index e415110d8e71a31d7b293ba90c58b0d76c957588..f1f283cdea9fb1ba9e04efa46594bd173fee0a46 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -548,6 +548,7 @@ sub get_interface($)
                ctdb0             => 50,
                ctdb1             => 51,
                ctdb2             => 52,
+               fileserversmb1    => 53,
 
                rootdnsforwarder  => 64,
 

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index d9311f4afb5606d142fca5e4f16ec615d6d1b6dd..92592922ead7e148d12e3b28f3390af9d1bccb65 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -216,6 +216,7 @@ sub check_env($$)
 
        simpleserver        => [],
        fileserver          => [],
+       fileserver_smb1     => [],
        maptoguest          => [],
        ktest               => [],
 
@@ -1197,7 +1198,7 @@ sub create_file_chmod($$)
 
 sub setup_fileserver
 {
-       my ($self, $path) = @_;
+       my ($self, $path, $more_conf, $server) = @_;
        my $prefix_abs = abs_path($path);
        my $srcdir_abs = abs_path($self->{srcdir});
 
@@ -1353,10 +1354,17 @@ sub setup_fileserver
        read only = No
 ";
 
+       if (defined($more_conf)) {
+               $fileserver_options = $fileserver_options . $more_conf;
+       }
+       if (!defined($server)) {
+               $server = "FILESERVER";
+       }
+
        my $vars = $self->provision(
            prefix => $path,
            domain => "WORKGROUP",
-           server => "FILESERVER",
+           server => $server,
            password => "fileserver",
            extra_options => $fileserver_options,
            no_delete_prefix => 1);
@@ -1415,6 +1423,16 @@ sub setup_fileserver
        return $vars;
 }
 
+sub setup_fileserver_smb1
+{
+       my ($self, $path) = @_;
+       my $conf = "
+[global]
+       client min protocol = CORE
+       server min protocol = LANMAN1
+";
+       return $self->setup_fileserver($path, $conf, "FILESERVERSMB1");
+}
 sub setup_ktest
 {
        my ($self, $prefix) = @_;