From 1286f5345515bec5295497b1370db830262c3890 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 30 Nov 2010 15:23:39 +1100
Subject: s4-dns: catch all DNS exceptions in samba_dnsupdate

---
 source4/scripting/bin/samba_dnsupdate | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'source4/scripting/bin/samba_dnsupdate')

diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index 8f04895655..faba124336 100755
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -46,7 +46,8 @@ from samba.samdb import SamDB
 from samba.dcerpc import netlogon, winbind
 
 samba.ensure_external_module("dns", "dnspython")
-import dns.resolver as resolver
+import dns.resolver
+import dns.exception
 
 default_ttl = 900
 am_rodc = False
@@ -172,8 +173,10 @@ def check_dns_name(d):
         return False
 
     try:
-        ans = resolver.query(normalised_name, d.type)
-    except resolver.NXDOMAIN:
+        ans = dns.resolver.query(normalised_name, d.type)
+    except dns.exception.DNSException:
+        if opts.verbose:
+            print "Failed to find DNS entry %s" % d
         return False
     if d.type == 'A':
         # we need to be sure that our IP is there
@@ -194,8 +197,9 @@ def check_dns_name(d):
                 else:
                     d.existing_port     = str(rdata.port)
                     d.existing_weight = str(rdata.weight)
+
     if opts.verbose:
-        print "Failed to find DNS entry %s" % d
+        print "Failed to find matching DNS entry %s" % d
 
     return False
 
-- 
cgit