[svn] commit: r3339 - /branches/vorner-recursor-config/src/bin/bind10/bind10.py.in

[BIND 10 source code commits]

Author: vorner
Date: Sat Oct 23 15:45:57 2010
New Revision: 3339

Log:
Do not pass config arguments to b10-recure

Modified:
    branches/vorner-recursor-config/src/bin/bind10/bind10.py.in

Modified: branches/vorner-recursor-config/src/bin/bind10/bind10.py.in
==============================================================================
--- branches/vorner-recursor-config/src/bin/bind10/bind10.py.in (original)
+++ branches/vorner-recursor-config/src/bin/bind10/bind10.py.in Sat Oct 23 15:45:57 2010
@@ -363,11 +363,14 @@
             dns_prog = 'b10-recurse'
         else:
             dns_prog = 'b10-auth'
-        dnsargs = [dns_prog, '-p', str(self.dns_port)]
-        if self.address:
-            dnsargs += ['-a', str(self.address)]
-        if self.nocache:
-            dnsargs += ['-n']
+        dnsargs = [dns_prog]
+        if not self.recursive:
+            # The recursive uses configuration manager for these
+            dnsargs += ['-p', str(self.dns_port)]
+            if self.address:
+                dnsargs += ['-a', str(self.address)]
+            if self.nocache:
+                dnsargs += ['-n']
         if self.uid:
             dnsargs += ['-u', str(self.uid)]
         if self.verbose: