summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/Makefile.in2
-rwxr-xr-xsource4/scripting/bin/samba_dnsupdate13
2 files changed, 11 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 2ad8eccdb2..0e72feae79 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3328,7 +3328,7 @@ test:: all torture timelimit
VFSLIBDIR="$(builddir)/bin" \
RUN_FROM_BUILD_FARM="$(RUN_FROM_BUILD_FARM)" \
SUBUNIT_FORMATTER="$(SUBUNIT_FORMATTER)" \
- PERL="$(PERL)" PYTHON="$(PYTHON)" \
+ PERL="$(PERL)" PYTHON="$(PYTHON)" PYTHONPATH="$(srcdir)/../bin/python" \
$(srcdir)/selftest/s3-selftest.sh
test-%:
diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index d21496ca21..ab87356484 100755
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -278,10 +278,17 @@ def call_nsupdate(d):
print "Calling nsupdate for %s" % d
if opts.use_file is not None:
- wfile = open(opts.use_file, 'a')
- fcntl.lockf(wfile, fcntl.LOCK_EX)
+ rfile = open(opts.use_file, 'r+')
+ fcntl.lockf(rfile, fcntl.LOCK_EX)
+ (file_dir, file_name) = os.path.split(opts.use_file)
+ (tmp_fd, tmpfile) = tempfile.mkstemp(dir=file_dir, prefix=file_name, suffix="XXXXXX")
+ wfile = os.fdopen(tmp_fd, 'a')
+ rfile.seek(0)
+ for line in rfile:
+ wfile.write(line)
wfile.write(str(d)+"\n")
- fcntl.lockf(wfile, fcntl.LOCK_UN)
+ os.rename(tmpfile, opts.use_file)
+ fcntl.lockf(rfile, fcntl.LOCK_UN)
return
normalised_name = d.name.rstrip('.') + '.'