diff options
| author | Andreas Schneider <asn@samba.org> | 2017-08-10 15:37:54 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2017-09-05 23:58:20 +0200 |
| commit | 8f2dee256e281c438105689b073f09685f161b16 (patch) | |
| tree | 8cc6ea1e2b9f8dd1ca345a9d91d7143b165fc0db /wintest | |
| parent | 3fa7c43ef73b6582e8985bf6d82465ffded9e5db (diff) | |
| download | samba-8f2dee256e281c438105689b073f09685f161b16.tar.gz | |
python:samba: Use 'binddns dir' in samba-tool and samba_upgradedns
This provisions the bind_dlz files in the 'binddns dir'. If you want to
migrate to the new files strcuture you can run samba_upgradedns!
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12957
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlet <abartlet@samba.org>
Diffstat (limited to 'wintest')
| -rw-r--r-- | wintest/wintest.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wintest/wintest.py b/wintest/wintest.py index 3493df4e457..4fe35e3481a 100644 --- a/wintest/wintest.py +++ b/wintest/wintest.py @@ -341,15 +341,15 @@ nameserver %s elif self.getvar('NAMESERVER_BACKEND') != 'SAMBA_INTERNAL': if self.named_supports_gssapi_keytab(): self.setvar("NAMED_TKEY_OPTION", - 'tkey-gssapi-keytab "${PREFIX}/private/dns.keytab";') + 'tkey-gssapi-keytab "${PREFIX}/bind-dns/dns.keytab";') else: self.info("LCREALM=${LCREALM}") self.setvar("NAMED_TKEY_OPTION", '''tkey-gssapi-credential "DNS/${LCREALM}"; tkey-domain "${LCREALM}"; ''') - self.putenv('KEYTAB_FILE', '${PREFIX}/private/dns.keytab') - self.putenv('KRB5_KTNAME', '${PREFIX}/private/dns.keytab') + self.putenv('KEYTAB_FILE', '${PREFIX}/bind-dns/dns.keytab') + self.putenv('KRB5_KTNAME', '${PREFIX}/bind-dns/dns.keytab') else: self.setvar("NAMED_TKEY_OPTION", "") |