[svn] commit: r3934 - /trunk/src/bin/bind10/bind10.py.in

[BIND 10 source code commits]

Author: shane
Date: Tue Dec 21 14:37:52 2010
New Revision: 3934

Log:
Fix a big which prevented the '--address' option from working.

Also cleaned up a bit of the parameter parsing and such.

See Trac ticket 442 for more details:

https://bind10.isc.org/ticket/442

Modified:
    trunk/src/bin/bind10/bind10.py.in

Modified: trunk/src/bin/bind10/bind10.py.in
==============================================================================
--- trunk/src/bin/bind10/bind10.py.in (original)
+++ trunk/src/bin/bind10/bind10.py.in Tue Dec 21 14:37:52 2010
@@ -206,12 +206,11 @@
         """
         self.address = address
         self.dns_port = dns_port
-        self.forward = None
-        self.recursive = False
+        self.forward = forward
         if forward:
-            self.forward = forward
             self.recursive = True
-            self.nocache = False
+        else:
+            self.recursive = False
         self.cc_session = None
         self.ccs = None
         self.cfg_start_auth = True
@@ -740,7 +739,7 @@
     try:
         if opt_str in ['-a', '--address']:
             parser.values.address = isc.net.parse.addr_parse(value)
-        if opt_str in ['-f', '--forward']:
+        elif opt_str in ['-f', '--forward']:
             parser.values.forward = isc.net.parse.addr_parse(value)
         else:
             raise OptionValueError("Unknown option " + opt_str)
@@ -763,7 +762,7 @@
                       action="callback", callback=check_addr, default=None,
                       help="address the DNS server will use (default: listen on all addresses)")
     parser.add_option("-f", "--forward", dest="forward", type="string",
-                      action="callback", callback=check_addr, default='',
+                      action="callback", callback=check_addr, default=None,
                       help="nameserver to which DNS queries should be forwarded")
     parser.add_option("-m", "--msgq-socket-file", dest="msgq_socket_file",
                       type="string", default=None,