Moved hostname handling into try block to avoid an unhandled exception in case of...

diff --git a/cgi-bin/dyndns.py b/cgi-bin/dyndns.py
index b89cd39e02a9e385fc63e27932d43e1615cf6592..7863b791e07b64deb99a86de2cef3a292809fbc8 100755 (executable)
--- a/cgi-bin/dyndns.py
+++ b/cgi-bin/dyndns.py
@@ -34,11 +34,6 @@ backmx   = fields.getvalue('backmx')
 offline  = fields.getvalue('offline')
 
 
-# Strip zone
-hostname = hostname.strip()
-if hostname.endswith(ZONE):
-       hostname = hostname[:-len(ZONE)]
-
 try:
        # check username
        user_info = pwd.getpwnam(username) # returns a key error if the user does not exist
@@ -53,6 +48,11 @@ try:
        if re.match(r'[-0-9a-z]+(\.[-0-9a-z]+)*$', hostname) is None:
                raise RuntimeError('Invalid host name')
 
+       # strip zone
+       hostname = hostname.strip()
+       if hostname.endswith(ZONE):
+               hostname = hostname[:-len(ZONE)]
+
        # check IP address
        ip = ipaddr.IPAddress(myip) # throws axception if the IP address is not valid
        if isinstance(ip, ipaddr.IPv4Address):