From: Andrew Bartlett Date: Sun, 26 Jun 2016 19:15:02 +0000 (+1200) Subject: Revert "source4/scripting: add an option to samba_dnsupdate to add ns records." X-Git-Tag: tdb-1.3.10~695 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ce7721b17331df2310812cf8563fda56f6cf008;p=thirdparty%2Fsamba.git Revert "source4/scripting: add an option to samba_dnsupdate to add ns records." This reverts a totally unnecessary change to samba_dnsupdate. The self test environment does the correct things with NS records now. This reverts commit af08cb2eee9dc9fabad6ca62ca11728209297222. Signed-off-by: Richard Sharpe Signed-off-by: Andrew Bartlett Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Mon Jun 27 04:13:04 CEST 2016 on sn-devel-144 --- diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate index 3880ddad7f9..16265f639fd 100755 --- a/source4/scripting/bin/samba_dnsupdate +++ b/source4/scripting/bin/samba_dnsupdate @@ -69,7 +69,6 @@ parser.add_option("--all-interfaces", action="store_true") parser.add_option("--current-ip", action="append", help="IP address to update DNS to match (helpful if behind NAT, valid multiple times, defaults to values from interfaces=)") parser.add_option("--rpc-server-ip", type="string", help="IP address of server to use with samba-tool (defaults to first --current-ip)") parser.add_option("--use-file", type="string", help="Use a file, rather than real DNS calls") -parser.add_option("--add-ns", action="store_true", help="Add an NS record to the DNS file for self-tests. Can only be used with --use-file") parser.add_option("--update-list", type="string", help="Add DNS names from the given file") parser.add_option("--update-cache", type="string", help="Cache database of already registered records") parser.add_option("--fail-immediately", action='store_true', help="Exit on first failure") @@ -682,15 +681,6 @@ dup_set = set() cache_set = set() rebuild_cache = False - -# Add an NS line if asked to ... -if opts.add_ns: - if opts.use_file is None: - print "Option --add-ns can only be used with --use-file" - sys.exit(1) - else: - dns_list.append(parse_dns_line("NS ${DNSDOMAIN} ${HOSTNAME}", sub_vars)) - try: cfile = open(dns_update_cache, 'r+') except IOError: