From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 7 Apr 2011 06:02:44 +0000 (+1000)
Subject: s4-samba_dnsupate Fix syntax error
X-Git-Tag: ldb-1.1.0~219
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=17fe5e0ca4fb46ffe344aa93e97d948ec82acf37

s4-samba_dnsupate Fix syntax error

This particular sub-part of the script isn't tested in 'make test' due
to it making real changes to DNS.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Thu Apr  7 08:51:11 CEST 2011 on sn-devel-104
---

diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index 695bed6e80f..e86fba29833 100755
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -259,20 +259,19 @@ def call_nsupdate(d):
     f.write("send\n")
     f.close()
 
+    global error_count
     os.environ["KRB5CCNAME"] = ccachename
     try:
         cmd = nsupdate_cmd[:]
         cmd.append(tmpfile)
         ret = subprocess.call(cmd, shell=False)
         if ret != 0:
-            global error_count
             if opts.fail_immediately:
                 sys.exit(1)
             error_count = error_count + 1
             if opts.verbose:
                 print("Failed nsupdate: %d" % ret)
     except Exception, estr:
-        global error_count
         if opts.fail_immediately:
             sys.exit(1)
         error_count = error_count + 1