1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00

samba_dnsupdate: make it clear that opts.use_file is active and we're not using nsupdate

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2019-02-07 09:40:19 +01:00 committed by Andrew Bartlett
parent 2f2da0966b
commit 767e60d973

View File

@ -443,10 +443,10 @@ def call_nsupdate(d, op="add"):
assert(op in ["add", "delete"]) assert(op in ["add", "delete"])
if opts.verbose:
print("Calling nsupdate for %s (%s)" % (d, op))
if opts.use_file is not None: if opts.use_file is not None:
if opts.verbose:
print("Use File instead of nsupdate for %s (%s)" % (d, op))
try: try:
rfile = open(opts.use_file, 'r+') rfile = open(opts.use_file, 'r+')
except IOError: except IOError:
@ -471,6 +471,9 @@ def call_nsupdate(d, op="add"):
fcntl.lockf(rfile, fcntl.LOCK_UN) fcntl.lockf(rfile, fcntl.LOCK_UN)
return return
if opts.verbose:
print("Calling nsupdate for %s (%s)" % (d, op))
normalised_name = d.name.rstrip('.') + '.' normalised_name = d.name.rstrip('.') + '.'
(tmp_fd, tmpfile) = tempfile.mkstemp() (tmp_fd, tmpfile) = tempfile.mkstemp()