From 3e5131e06d5b261973647ee30c3ee0a0b0cf0007 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Fri, 13 Dec 2019 10:22:36 +0000 Subject: [PATCH] selftest/target: Create new nt4_dc_smb1 environment 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 3bad7614332..b7b730eced5 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -551,6 +551,7 @@ sub get_interface($) ctdb2 => 52, fileserversmb1 => 53, addcsmb1 => 54, + lclnt4dc2smb1 => 55, rootdnsforwarder => 64, diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 92592922ead..d97eafa1daa 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -212,6 +212,7 @@ sub check_env($$) %Samba3::ENV_DEPS = ( # name => [dep_1, dep_2, ...], nt4_dc => [], + nt4_dc_smb1 => [], nt4_dc_schannel => [], simpleserver => [], @@ -234,7 +235,7 @@ sub check_env($$) sub setup_nt4_dc { - my ($self, $path) = @_; + my ($self, $path, $more_conf, $server) = @_; print "PROVISIONING NT4 DC..."; @@ -262,10 +263,16 @@ sub setup_nt4_dc check parent directory delete on close = yes "; + if (defined($more_conf)) { + $nt4_dc_options = $nt4_dc_options . $more_conf; + } + if (!defined($server)) { + $server = "LOCALNT4DC2"; + } my $vars = $self->provision( prefix => $path, domain => "SAMBA-TEST", - server => "LOCALNT4DC2", + server => $server, password => "localntdc2pass", extra_options => $nt4_dc_options); @@ -290,6 +297,17 @@ sub setup_nt4_dc return $vars; } +sub setup_nt4_dc_smb1 +{ + my ($self, $path) = @_; + my $conf = " +[global] + client min protocol = CORE + server min protocol = LANMAN1 +"; + return $self->setup_nt4_dc($path, $conf, "LCLNT4DC2SMB1"); +} + sub setup_nt4_dc_schannel { my ($self, $path) = @_; -- 2.47.3