diff options
author | Andrew Tridgell <tridge@samba.org> | 2011-11-22 14:58:29 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2011-11-22 06:34:59 +0100 |
commit | b16f539e0eb014591a3cf8f5e9a330999e53d96a (patch) | |
tree | 111fb3f60693c474bba2f39f53fe1108277de256 | |
parent | 3e6e1aed949a4483fc38607e443b5c8b715aca3b (diff) | |
download | samba-b16f539e0eb014591a3cf8f5e9a330999e53d96a.tar.gz samba-b16f539e0eb014591a3cf8f5e9a330999e53d96a.tar.bz2 samba-b16f539e0eb014591a3cf8f5e9a330999e53d96a.zip |
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@samba.org>
Autobuild-Date: Tue Nov 22 06:34:59 CET 2011 on sn-devel-104
-rwxr-xr-x | source4/scripting/bin/samba_dnsupdate | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate index d6751b0876..aa307eeed4 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: |