Now in both scripts only fqdn are allowed.

diff --git a/bin/nsupdate_dyndns b/bin/nsupdate_dyndns
index 49ed3e3b01ce1af8d0fd88e95c3cc0f291d22219..e49c08f6b1a7459a86f3497d00f3e615e7e532f1 100755 (executable)
--- a/bin/nsupdate_dyndns
+++ b/bin/nsupdate_dyndns
@@ -13,16 +13,20 @@ def ipfamily_by_ip(ip):
        assert False
 
 
        assert False
 
 

-def nsupdate_add(hostname, domain, ttl, ip):
-       """ip_family: A or AAAA"""
-       command = "update add {hostname}.{domain} {ttl} IN {ip_family} {ip}\n\n".format(hostname=hostname, domain=domain, ttl=ttl, ip_family=ipfamily_by_ip(ip), ip=ip)
+def nsupdate_add(fqdn, ttl, ip):
+       """
+       :param fqdn: Fully qualified domain name
+       :param ip_family: A or AAAA"""
+       command = "update add {fqdn} {ttl} IN {ip_family} {ip}\n\n".format(fqdn=fqdn, ttl=ttl, ip_family=ipfamily_by_ip(ip), ip=ip)

        p = Popen(['nsupdate', '-l'], stdin=PIPE)
        p.communicate(command)
 
 
        p = Popen(['nsupdate', '-l'], stdin=PIPE)
        p.communicate(command)
 
 

-def nsupdate_delete(hostname, domain, ip_family):
-       """ip_family: A or AAAA"""
-       command = "update delete {hostname}.{domain} {ip_family}\n\n".format(hostname=hostname, domain=domain, ip_family=ip_family)
+def nsupdate_delete(fqdn, ip_family):
+       """
+       :param fqdn: Fully qualified domain name
+       :param ip_family: A or AAAA"""
+       command = "update delete {fqdn} {ip_family}\n\n".format(fqdn=fqdn, ip_family=ip_family)

        p = Popen(['nsupdate', '-l'], stdin=PIPE)
        p.communicate(command)
 
        p = Popen(['nsupdate', '-l'], stdin=PIPE)
        p.communicate(command)
 


@@ -30,24 +34,23 @@ def nsupdate_delete(hostname, domain, ip_family):
 def main(args):
        if args.delete:
                if args.ip is None:
 def main(args):
        if args.delete:
                if args.ip is None:

-                       nsupdate_delete(args.hostname, args.domain, 'A')
-                       nsupdate_delete(args.hostname, args.domain, 'AAAA')
+                       nsupdate_delete(args.fqdn, 'A')
+                       nsupdate_delete(args.fqdn, 'AAAA')

                else:
                else:

-                       nsupdate_delete(args.hostname, args.domain, ipfamily_by_ip(args.ip))
+                       nsupdate_delete(args.fqdn, ipfamily_by_ip(args.ip))

        else:
        else:

-               nsupdate_delete(args.hostname, args.domain, ipfamily_by_ip(args.ip))
-               nsupdate_add(args.hostname, args.domain, args.ttl, args.ip)
+               nsupdate_delete(args.fqdn, ipfamily_by_ip(args.ip))
+               nsupdate_add(args.fqdn, args.ttl, args.ip)

 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':

-       parser = argparse.ArgumentParser(description='Add or delete a hostname from dyndns (simplifies call to nsupdate).')
+       parser = argparse.ArgumentParser(description='Add or delete a domain name from dyndns (simplifies call to nsupdate).')

        parser.add_argument('-d', '--delete', action='store_true', help='delete instead of add')
        parser.add_argument('-i', '--ip', help='IP address (either IPv4 or IPv6)')
        # parser.add_argument('-t', '--ttl', type=int, default=600, help='TTL (default: 600)')
        parser.add_argument('-d', '--delete', action='store_true', help='delete instead of add')
        parser.add_argument('-i', '--ip', help='IP address (either IPv4 or IPv6)')
        # parser.add_argument('-t', '--ttl', type=int, default=600, help='TTL (default: 600)')

-       parser.add_argument('hostname', help='hostname to add or delete, e.g. myserver')
+       parser.add_argument('fqdn', help='fully qualified domain name to add or delete, e.g. myserver.dyn.example.com')

        args = parser.parse_args()
 
        args = parser.parse_args()
 

-       args.domain = 'dyn.colgarra.priv.at' # <---- TODO

        args.ttl = 600 # <---- TODO
 
        # check ip
        args.ttl = 600 # <---- TODO
 
        # check ip


@@ -59,8 +62,8 @@ if __name__ == '__main__':
                except ValueError:
                        parser.error('The IP address is not valid')
 
                except ValueError:
                        parser.error('The IP address is not valid')
 

-       # check hostname
-       if re.match(r'[-0-9a-z]+(\.[-0-9a-z]+)*$', args.hostname) is None:
-               parser.error('The hostname has an invalid format.')
+       # check fqdn
+       if re.match(r'[-0-9a-z]+(\.[-0-9a-z]+)*$', args.fqdn) is None:
+               parser.error('The fqdn has an invalid format.')

 
        main(args)
 
        main(args)

diff --git a/cgi-bin/dyndns.py b/cgi-bin/dyndns.py
index 417c27a2c9981681117659a5ee8c214afaa52d63..1a074b29994e6c024bbef5cfb1cfdab16c87153f 100755 (executable)
--- a/cgi-bin/dyndns.py
+++ b/cgi-bin/dyndns.py
@@ -13,7 +13,6 @@ import ipaddr
 
 # Configuration
 PASSWORD = 'hygCithOrs5'
 
 # Configuration
 PASSWORD = 'hygCithOrs5'

-ZONE = '.dyn.colgarra.priv.at'

 DEBUG = False
 
 
 DEBUG = False
 
 


@@ -134,8 +133,6 @@ try:
 
        # strip zone
        hostname = hostname.strip()
 
        # strip zone
        hostname = hostname.strip()

-       if hostname.endswith(ZONE):
-               hostname = hostname[:-len(ZONE)]

 
        # check offline
        if offline is None or offline.lower() == 'no':
 
        # check offline
        if offline is None or offline.lower() == 'no':