Merge pull request #280 from ThomasWaldmann/fix-247

fix crash on ShortHeader and other DNSException subclasses, fixes #247
nsupdate-info · Aug 27, 2016 · fbb781d · fbb781d
2 parents 6ffc265 + 118d0d5
commit fbb781d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/nsupdate/main/dnstools.py b/nsupdate/main/dnstools.py
@@ -64,6 +64,7 @@ def __str__(self):
 
 Timeout = dns.resolver.Timeout
 NoNameservers = dns.resolver.NoNameservers
+DNSException = dns.exception.DNSException
 
 
 class SameIpError(ValueError):

diff --git a/nsupdate/main/views.py b/nsupdate/main/views.py
@@ -238,6 +238,8 @@ def form_valid(self, form):
             success, level, msg = False, messages.ERROR, 'Base domain does not exist.'
         except dnstools.SameIpError:
             success, level, msg = False, messages.ERROR, 'Host already exists in DNS.'
+        except dnstools.DNSException as e:
+            success, level, msg = False, messages.ERROR, 'DNSException [%s]' % str(e)
         except socket.error as err:
             success, level, msg = False, messages.ERROR, 'Communication to name server failed [%s]' % str(err)
         else: