Browse Source

Do not pass config arguments to b10-recure

git-svn-id: svn://bind10.isc.org/svn/bind10/branches/vorner-recursor-config@3339 e5f2f494-b856-4b98-b285-d166d9295462
Michal Vaner 14 years ago
parent
commit
3fc3a584d5
1 changed files with 8 additions and 5 deletions
  1. 8 5
      src/bin/bind10/bind10.py.in

+ 8 - 5
src/bin/bind10/bind10.py.in

@@ -363,11 +363,14 @@ class BoB:
             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: