[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  b16f539 s4-dns: added --no-credentials option to samba_dnsupdate
      from  3e6e1ae Fix a bunch of "warning: variable ‘XXXX’ set but not used [-Wunused-but-set-variable]" warnings from the new gcc.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b16f539e0eb014591a3cf8f5e9a330999e53d96a
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Nov 22 14:58:29 2011 +1100

    s4-dns: added --no-credentials option to samba_dnsupdate
    
    this is for a user who is doing DNS updates via key files rather than
    GSSAPI. This allows the update to go through without a kerberos error
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Tue Nov 22 06:34:59 CET 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/bin/samba_dnsupdate |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index d6751b0..aa307ee 100755
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -63,6 +63,7 @@ parser.add_option("--all-interfaces", action="store_true")
 parser.add_option("--use-file", type="string", help="Use a file, rather than real DNS calls")
 parser.add_option("--update-list", type="string", help="Add DNS names from the given file")
 parser.add_option("--fail-immediately", action='store_true', help="Exit on first failure")
+parser.add_option("--no-credentials", dest='nocreds', action='store_true', help="don't try and get credentials")
 
 creds = None
 ccachename = None
@@ -308,11 +309,16 @@ def call_nsupdate(d):
     f.close()
 
     global error_count
-    os.environ["KRB5CCNAME"] = ccachename
+    if ccachename:
+        os.environ["KRB5CCNAME"] = ccachename
     try:
         cmd = nsupdate_cmd[:]
         cmd.append(tmpfile)
-        ret = subprocess.call(cmd, shell=False, env={"KRB5CCNAME": ccachename})
+        if ccachename:
+            env = {"KRB5CCNAME": ccachename}
+        else:
+            env = {}
+        ret = subprocess.call(cmd, shell=False, env=env)
         if ret != 0:
             if opts.fail_immediately:
                 if opts.verbose:
@@ -471,7 +477,8 @@ if len(update_list) == 0:
     sys.exit(0)
 
 # get our krb5 creds
-get_credentials(lp)
+if not opts.nocreds:
+    get_credentials(lp)
 
 # ask nsupdate to add entries as needed
 for d in update_list:


-- 
Samba Shared Repository