diff options
author | Andreas Schneider <asn@samba.org> | 2017-09-06 07:25:40 +0200 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2017-09-16 00:57:25 +0200 |
commit | 8cf5c5f0fae97c7215eb09070049cdb29377dc97 (patch) | |
tree | aae1ef6e0ff73e4bbb6f33c3172a21301b27ae9f /source4/scripting | |
parent | aef2b915a2020786f79650078b318d471a6f0381 (diff) | |
download | samba-8cf5c5f0fae97c7215eb09070049cdb29377dc97.tar.gz |
samba_upgradedns: Print better hints after we migrated the config
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12957
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source4/scripting')
-rwxr-xr-x | source4/scripting/bin/samba_upgradedns | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns index db3ef5c6d65..3369bcfed93 100755 --- a/source4/scripting/bin/samba_upgradedns +++ b/source4/scripting/bin/samba_upgradedns @@ -442,6 +442,12 @@ if __name__ == '__main__': # Special stuff for DLZ backend if opts.dns_backend == "BIND9_DLZ": + config_migration = False + + if (paths.private_dir != paths.binddns_dir and + os.path.isfile(os.path.join(paths.private_dir, "named.conf"))): + config_migration = True + # Check if dns-HOSTNAME account exists and create it if required secrets_msgs = ldbs.secrets.search(expression='(samAccountName=dns-%s)' % hostname, attrs=['secret']) msg = ldbs.sam.search(base=domaindn, scope=ldb.SCOPE_DEFAULT, @@ -537,9 +543,15 @@ if __name__ == '__main__': cleanup_obsolete_dns_files(paths) - logger.info("See %s for an example configuration include file for BIND", paths.namedconf) - logger.info("and %s for further documentation required for secure DNS " - "updates", paths.namedtxt) + if config_migration: + logger.info("ATTENTION: The BIND configuration and keytab has been moved to: %s", + paths.binddns_dir) + logger.info(" Please update your BIND configuration accordingly.") + else: + logger.info("See %s for an example configuration include file for BIND", paths.namedconf) + logger.info("and %s for further documentation required for secure DNS " + "updates", paths.namedtxt) + elif opts.dns_backend == "SAMBA_INTERNAL": # Check if dns-HOSTNAME account exists and delete it if required try: |