diff options
| author | Richard Sharpe <rsharpe@samba.org> | 2016-05-23 17:37:13 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2016-06-21 00:51:01 +0200 |
| commit | af08cb2eee9dc9fabad6ca62ca11728209297222 (patch) | |
| tree | 30230ba49f51ee9f1ae76f9d5d99f1faa7df4c0b /source4/scripting | |
| parent | 7d9a8760400c8135374634767691e7a5f7a3a639 (diff) | |
| download | samba-af08cb2eee9dc9fabad6ca62ca11728209297222.tar.gz | |
source4/scripting: add an option to samba_dnsupdate to add ns records.
Add a --add-ns option to samba_dnsupdate and use that, but only when --use-file has been specified, to add an NS record to the file produced.
This allows us to make progress in the self tests and is an interim fix.
Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-by: Rowland Penny <repenny241155@gmail.com>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Jun 21 00:51:02 CEST 2016 on sn-devel-144
Diffstat (limited to 'source4/scripting')
| -rwxr-xr-x | source4/scripting/bin/samba_dnsupdate | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate index 16265f639fd..3880ddad7f9 100755 --- a/source4/scripting/bin/samba_dnsupdate +++ b/source4/scripting/bin/samba_dnsupdate @@ -69,6 +69,7 @@ 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") @@ -681,6 +682,15 @@ 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: |