samba_dnsupdate: Allow the tool to work in 'make test'.
authorAndreas Schneider <asn@samba.org>
Thu, 11 Sep 2014 08:59:20 +0000 (10:59 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 18 Dec 2014 05:47:40 +0000 (06:47 +0100)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/scripting/bin/samba_dnsupdate

index 427b5dc869f1e42066116993d8ec35b262e653cb..7f9406783df1c61bd59ec4e747269e1ee35aa5dd 100755 (executable)
@@ -207,7 +207,10 @@ def check_dns_name(d):
                 return True
         return False
 
-    resolver = dns.resolver.Resolver()
+    resolv_conf = os.getenv('RESOLV_WRAPPER_CONF')
+    if not resolv_conf:
+        resolv_conf = '/etc/resolv.conf'
+    resolver = dns.resolver.Resolver(filename=resolv_conf, configure=True)
 
     if d.nameservers != []:
         resolver.nameservers = d.nameservers
@@ -387,7 +390,7 @@ def call_nsupdate(d, op="add"):
     try:
         cmd = nsupdate_cmd[:]
         cmd.append(tmpfile)
-        env = {}
+        env = os.environ
         if krb5conf:
             env["KRB5_CONFIG"] = krb5conf
         if ccachename: