BIND 10 master, updated. 541478374f183c2742a7f07e6558836a4dd09570 Changelog for #572
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Feb 15 09:36:52 UTC 2011
The branch, master has been updated
via 541478374f183c2742a7f07e6558836a4dd09570 (commit)
via 17f237478961005707d649a661cc72a4a0d612d4 (commit)
via 12c23a667c1e9a4b92d1cd8fc07136faf4c41a8a (commit)
via 411b0f674614000d1f4606e0c225d078c1981628 (commit)
from dd61821a6c910d90c4a46024e303965048dde0aa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 541478374f183c2742a7f07e6558836a4dd09570
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Tue Feb 15 10:36:03 2011 +0100
Changelog for #572
commit 17f237478961005707d649a661cc72a4a0d612d4
Merge: dd61821a6c910d90c4a46024e303965048dde0aa 12c23a667c1e9a4b92d1cd8fc07136faf4c41a8a
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Tue Feb 15 10:26:29 2011 +0100
Merge branch 'work/boss/no-forward'
commit 12c23a667c1e9a4b92d1cd8fc07136faf4c41a8a
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Tue Feb 15 10:22:04 2011 +0100
[trac572] Variable renaming
commit 411b0f674614000d1f4606e0c225d078c1981628
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Sun Feb 13 12:10:58 2011 +0100
[trac572] Remove Boss's -f
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
src/bin/bind10/bind10.py.in | 42 ++++++++++++------------------------------
2 files changed, 17 insertions(+), 30 deletions(-)
-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index ad4e9ea..6345608 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+ 168. [bug] vorner
+ Boss no longer has the -f argument, which was undocumented and stayed as
+ a relict of previous versions, currently causing only strange behaviour.
+ (Trac #572, git 17f237478961005707d649a661cc72a4a0d612d4)
+
167. [bug] naokikambe
Fixed failure of termination of msgq_test.py with python3 coverage(3.3.1)
(Trac #573, git 0e6a18e12f61cc482e07078776234f32605312e5)
diff --git a/src/bin/bind10/bind10.py.in b/src/bin/bind10/bind10.py.in
index 7594b77..48d5b38 100644
--- a/src/bin/bind10/bind10.py.in
+++ b/src/bin/bind10/bind10.py.in
@@ -195,8 +195,7 @@ class BoB:
"""Boss of BIND class."""
def __init__(self, msgq_socket_file=None, dns_port=5300, address=None,
- forward=None, nocache=False, verbose=False, setuid=None,
- username=None):
+ nocache=False, verbose=False, setuid=None, username=None):
"""
Initialize the Boss of BIND. This is a singleton (only one can run).
@@ -206,11 +205,6 @@ class BoB:
"""
self.address = address
self.dns_port = dns_port
- self.forward = forward
- if forward:
- self.resolver = True
- else:
- self.resolver = False
self.cc_session = None
self.ccs = None
self.cfg_start_auth = True
@@ -422,26 +416,19 @@ class BoB:
"""
Start the Authoritative server
"""
- # XXX: this must be read from the configuration manager in the future
- if self.resolver:
- dns_prog = 'b10-resolver'
- else:
- dns_prog = 'b10-auth'
- dnsargs = [dns_prog]
- if not self.resolver:
- # The resolver uses configuration manager for these
- dnsargs += ['-p', str(self.dns_port)]
- if self.address:
- dnsargs += ['-a', str(self.address)]
- if self.nocache:
- dnsargs += ['-n']
+ authargs = ['b10-auth']
+ authargs += ['-p', str(self.dns_port)]
+ if self.address:
+ authargs += ['-a', str(self.address)]
+ if self.nocache:
+ authargs += ['-n']
if self.uid:
- dnsargs += ['-u', str(self.uid)]
+ authargs += ['-u', str(self.uid)]
if self.verbose:
- dnsargs += ['-v']
+ authargs += ['-v']
# ... and start
- self.start_process("b10-auth", dnsargs, c_channel_env,
+ self.start_process("b10-auth", authargs, c_channel_env,
self.dns_port, self.address)
def start_resolver(self, c_channel_env):
@@ -739,8 +726,6 @@ def check_addr(option, opt_str, value, parser):
try:
if opt_str in ['-a', '--address']:
parser.values.address = isc.net.parse.addr_parse(value)
- elif opt_str in ['-f', '--forward']:
- parser.values.forward = isc.net.parse.addr_parse(value)
else:
raise OptionValueError("Unknown option " + opt_str)
except ValueError:
@@ -761,9 +746,6 @@ def main():
parser.add_option("-a", "--address", dest="address", type="string",
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=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,
help="UNIX domain socket file the b10-msgq daemon will use")
@@ -833,8 +815,8 @@ def main():
# Go bob!
boss_of_bind = BoB(options.msgq_socket_file, options.dns_port,
- options.address, options.forward, options.nocache,
- options.verbose, setuid, username)
+ options.address, options.nocache, options.verbose,
+ setuid, username)
startup_result = boss_of_bind.startup()
if startup_result:
sys.stderr.write("[bind10] Error on startup: %s\n" % startup_result)
More information about the bind10-changes
mailing list