From fcae89684edb8be453a261641195d1a29b264bf4 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Wed, 4 Dec 2019 11:50:48 +0000 Subject: [PATCH] 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 Reviewed-by: Ralph Boehme --- selftest/target/Samba.pm | 1 + selftest/target/Samba3.pm | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index e415110d8e7..f1f283cdea9 100644 --- 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 d9311f4afb5..92592922ead 100755 --- 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) = @_;