diff options
| author | Andreas Schneider <asn@samba.org> | 2017-08-22 17:10:01 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2017-09-05 23:58:20 +0200 |
| commit | 3fa7c43ef73b6582e8985bf6d82465ffded9e5db (patch) | |
| tree | 2511f5d780f4f03994ba9cfd737d583bac67280d /selftest/target/Samba4.pm | |
| parent | 4c9608fb27b0f1bef846b72291ecb515045d3507 (diff) | |
| download | samba-3fa7c43ef73b6582e8985bf6d82465ffded9e5db.tar.gz | |
s4:bind_dlz: Use the 'binddns dir' if possible
The code makes sure we are backwards compatible. It will first check if
we still have files in the private directory, if yes it will use those.
If the the file is not in the private directory it will try the binddns
dir.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlet <abartlet@samba.org>
Diffstat (limited to 'selftest/target/Samba4.pm')
| -rwxr-xr-x | selftest/target/Samba4.pm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 205e2813db6..39a64ae3d81 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -467,6 +467,7 @@ sub provision_raw_prepare($$$$$$$$$$$) $ctx->{krb5_ccache} = "$prefix_abs/krb5_ccache"; $ctx->{mitkdc_conf} = "$ctx->{etcdir}/mitkdc.conf"; $ctx->{privatedir} = "$prefix_abs/private"; + $ctx->{binddnsdir} = "$prefix_abs/bind-dns"; $ctx->{ncalrpcdir} = "$prefix_abs/ncalrpc"; $ctx->{lockdir} = "$prefix_abs/lockdir"; $ctx->{logdir} = "$prefix_abs/logs"; @@ -494,6 +495,7 @@ sub provision_raw_prepare($$$$$$$$$$$) $ctx->{interfaces} = "$ctx->{ipv4}/8 $ctx->{ipv6}/64"; push(@{$ctx->{directories}}, $ctx->{privatedir}); + push(@{$ctx->{directories}}, $ctx->{binddnsdir}); push(@{$ctx->{directories}}, $ctx->{etcdir}); push(@{$ctx->{directories}}, $ctx->{piddir}); push(@{$ctx->{directories}}, $ctx->{lockdir}); @@ -584,6 +586,7 @@ sub provision_raw_step1($$) workgroup = $ctx->{domain} realm = $ctx->{realm} private dir = $ctx->{privatedir} + binddns dir = $ctx->{binddnsdir} pid directory = $ctx->{piddir} ncalrpc dir = $ctx->{ncalrpcdir} lock dir = $ctx->{lockdir} @@ -725,6 +728,7 @@ nogroup:x:65534:nobody STATEDIR => $ctx->{statedir}, CACHEDIR => $ctx->{cachedir}, PRIVATEDIR => $ctx->{privatedir}, + BINDDNSDIR => $ctx->{binddnsdir}, SERVERCONFFILE => $ctx->{smb_conf}, CONFIGURATION => $configuration, SOCKET_WRAPPER_DEFAULT_IFACE => $ctx->{swiface}, |