summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-12-28 10:05:40 +1100
committerStefan Metzmacher <metze@samba.org>2013-01-10 20:56:50 +0100
commitedbc26bca84ee77b5a9571ba8dc9416c0db25906 (patch)
treedc0470a440ce60acf783b6bdf576dd648226ad54 /source4/scripting
parent051a1a9c6417c2cbffa7d091ae477a6c7922d363 (diff)
downloadsamba-edbc26bca84ee77b5a9571ba8dc9416c0db25906.tar.gz
samba-edbc26bca84ee77b5a9571ba8dc9416c0db25906.tar.bz2
samba-edbc26bca84ee77b5a9571ba8dc9416c0db25906.zip
scripting/samba_upgradedns: Only look for IPv4/IPv6 addresses if we actually them
This allows the script to be used to create/remove the samba-specific dns-SERVER account when we do not need to create the in-directory partition. Andrew Bartlett Reviewed-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Thu Jan 10 20:56:50 CET 2013 on sn-devel-104
Diffstat (limited to 'source4/scripting')
-rwxr-xr-xsource4/scripting/bin/samba_upgradedns43
1 files changed, 22 insertions, 21 deletions
diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns
index ba597cfa07..f389ef7f4a 100755
--- a/source4/scripting/bin/samba_upgradedns
+++ b/source4/scripting/bin/samba_upgradedns
@@ -278,27 +278,6 @@ if __name__ == '__main__':
logger.error("Cannot create AD based DNS for OS level < 2003")
sys.exit(1)
- logger.info("Looking up IPv4 addresses")
- hostip = interface_ips_v4(lp)
- try:
- hostip.remove('127.0.0.1')
- except ValueError:
- pass
- if not hostip:
- logger.error("No IPv4 addresses found")
- sys.exit(1)
- else:
- hostip = hostip[0]
- logger.debug("IPv4 addresses: %s" % hostip)
-
- logger.info("Looking up IPv6 addresses")
- hostip6 = interface_ips_v6(lp, linklocal=False)
- if not hostip6:
- hostip6 = None
- else:
- hostip6 = hostip6[0]
- logger.debug("IPv6 addresses: %s" % hostip6)
-
domaindn = names.domaindn
forestdn = names.rootdn
@@ -351,6 +330,28 @@ if __name__ == '__main__':
ncname = msg[0]['nCName'][0]
except Exception, e:
logger.info("Creating DNS partitions")
+
+ logger.info("Looking up IPv4 addresses")
+ hostip = interface_ips_v4(lp)
+ try:
+ hostip.remove('127.0.0.1')
+ except ValueError:
+ pass
+ if not hostip:
+ logger.error("No IPv4 addresses found")
+ sys.exit(1)
+ else:
+ hostip = hostip[0]
+ logger.debug("IPv4 addresses: %s" % hostip)
+
+ logger.info("Looking up IPv6 addresses")
+ hostip6 = interface_ips_v6(lp, linklocal=False)
+ if not hostip6:
+ hostip6 = None
+ else:
+ hostip6 = hostip6[0]
+ logger.debug("IPv6 addresses: %s" % hostip6)
+
create_dns_partitions(ldbs.sam, domainsid, names, domaindn, forestdn,
dnsadmins_sid)