Attachment 8398 Details for Bug 9517 – proposed patch cherry-picked from master

[patch] proposed patch cherry-picked from master

samba_dnsupdate-set-KRB5_CONFIG_fix_bug_9512.patch (text/plain), 1.64 KB, created by Björn Baumbach on 2013-01-09 16:09:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2013-01-09 16:09:52 UTC

Size: 1.64 KB

patch

obsolete

>From 40dcd2d2317f6c1035dee192aa2998dddd9b92f4 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Thu, 20 Dec 2012 15:57:43 +0100
>Subject: [PATCH] samba_dnsupdate: set KRB5_CONFIG for nsupdate command (bug
> #9517)
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Let nslookup use krb5.conf, which is set in our KRB5_CONFIG.
>
>Signed-off-by: BjÃ¶rn Baumbach <bb@sernet.de>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 4d1fd0b7daa089bd8863f0efcaf258bf30192c29)
>---
> source4/scripting/bin/samba_dnsupdate |    9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
>index a700118..a5cece1 100755
>--- a/source4/scripting/bin/samba_dnsupdate
>+++ b/source4/scripting/bin/samba_dnsupdate
>@@ -278,7 +278,7 @@ def get_subst_vars(samdb):
> 
> def call_nsupdate(d):
>     """call nsupdate for an entry."""
>-    global ccachename, nsupdate_cmd
>+    global ccachename, nsupdate_cmd, krb5conf
> 
>     if opts.verbose:
>         print "Calling nsupdate for %s" % d
>@@ -333,10 +333,11 @@ def call_nsupdate(d):
>     try:
>         cmd = nsupdate_cmd[:]
>         cmd.append(tmpfile)
>+        env = {}
>+        if krb5conf:
>+            env["KRB5_CONFIG"] = krb5conf
>         if ccachename:
>-            env = {"KRB5CCNAME": ccachename}
>-        else:
>-            env = {}
>+            env["KRB5CCNAME"] = ccachename
>         ret = subprocess.call(cmd, shell=False, env=env)
>         if ret != 0:
>             if opts.fail_immediately:
>-- 
>1.7.8.6
>

Flags:

metze: review+
abartlet: review+

Actions: View

Attachments on bug 9517: 8398