sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

selftest:Samba3: add simpleserver globals before include = global_inject.conf

Browse Source 
This allows overriding any existing parameter.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=9705

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Stefan Metzmacher 2024-07-12 18:26:07 +02:00
parent 8937dce133
commit 1e21b99b64
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
selftest/target/Samba3.pm
View File

@ -1716,14 +1716,16 @@ sub setup_simpleserver
remove_tree($external_streams_depot);
mkdir($external_streams_depot, 0777);
my $simpleserver_options = "
my $simpleserver_options_globals = "
lanman auth = yes
ntlm auth = yes
vfs objects = xattr_tdb streams_depot
change notify = no
server smb encrypt = off
allow trusted domains = no
";
my $simpleserver_options = "
[vfs_aio_pthread]
path = $prefix_abs/share
read only = no
@ -1781,6 +1783,7 @@ sub setup_simpleserver
domain => "WORKGROUP",
server => "LOCALSHARE4",
password => "local4pass",
extra_options_before_inject => $simpleserver_options_globals,
extra_options => $simpleserver_options);
$vars or return undef;
@ -2554,7 +2557,8 @@ sub provision($$)
my $realm = $args{realm};
my $server = $args{server};
my $password = $args{password};
my $extra_options = $args{extra_options};
my $extra_options_before_inject = $args{extra_options_before_inject} // "";
my $extra_options = $args{extra_options} // "";
my $resolv_conf = $args{resolv_conf};
my $no_delete_prefix= $args{no_delete_prefix};
my $netbios_name = $args{netbios_name} // $server;
@ -3004,6 +3008,10 @@ sub provision($$)
#it just means we ALLOW one to be configured.
allow insecure wide links = yes
# Begin extra options before global inject
$extra_options_before_inject
# End extra options befoore global inject
include = $globalinjectconf
# Begin extra options