summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicky Nance <ricky.nance@gmail.com>2013-12-31 10:58:16 -0600
committerAndrew Bartlett <abartlet@samba.org>2014-01-07 06:05:15 +0100
commit0dc30b9fe8243e9596e4016a20e1f7f19223ed1a (patch)
tree590c28463f8d23d42725bc149aff53aa2bda1268
parent472b2990914120118cf126a7a40f568897ef5522 (diff)
downloadsamba-0dc30b9fe8243e9596e4016a20e1f7f19223ed1a.tar.gz
samba-0dc30b9fe8243e9596e4016a20e1f7f19223ed1a.tar.xz
samba-0dc30b9fe8243e9596e4016a20e1f7f19223ed1a.zip
samba_upgradedns: message the user if they need to change smb.conf
Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Kai Blin <kai@samba.org> Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Tue Jan 7 06:05:15 CET 2014 on sn-devel-104
-rwxr-xr-xsource4/scripting/bin/samba_upgradedns16
1 files changed, 16 insertions, 0 deletions
diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns
index d2c96cc1c27..c4f21449699 100755
--- a/source4/scripting/bin/samba_upgradedns
+++ b/source4/scripting/bin/samba_upgradedns
@@ -500,3 +500,19 @@ if __name__ == '__main__':
logger.info("Failed to delete %s from sam.ldb" % dn)
logger.info("Finished upgrading DNS")
+
+ services = lp.get("server services")
+ for service in services:
+ if service == "dns":
+ if opts.dns_backend.startswith("BIND"):
+ logger.info("You have switched to using %s as your dns backend,"
+ " but still have the internal dns starting. Please"
+ " make sure you add '-dns' to your server services"
+ " line in your smb.conf." % opts.dns_backend)
+ break
+ else:
+ if opts.dns_backend == "SAMBA_INTERNAL":
+ logger.info("You have switched to using %s as your dns backend,"
+ " but you still have samba starting looking for a"
+ " BIND backend. Please remove the -dns from your"
+ " server services line." % opts.dns_backend)