BIND 10 master, updated. 40f6dd2b378f31f4ec561eeeac534874a02a8ae8 Merge branch 'master' of git+ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  40f6dd2b378f31f4ec561eeeac534874a02a8ae8 (commit)
       via  b54f1b460285db4d6ae89dd716098a88363b1511 (commit)
      from  84fa061af28d72e51939039bfcbb04e1febc3cb1 (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 40f6dd2b378f31f4ec561eeeac534874a02a8ae8
Merge: b54f1b460285db4d6ae89dd716098a88363b1511 84fa061af28d72e51939039bfcbb04e1febc3cb1
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Fri Nov 18 18:39:41 2011 +0100

    Merge branch 'master' of git+ssh://git.bind10.isc.org/var/bind10/git/bind10

commit b54f1b460285db4d6ae89dd716098a88363b1511
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Fri Nov 18 18:39:05 2011 +0100

    Remove forgotten unused code
    
    Acked on jabber

-----------------------------------------------------------------------

Summary of changes:
 src/bin/bind10/bind10_src.py.in        |    4 ----
 src/bin/bind10/tests/bind10_test.py.in |    9 ---------
 2 files changed, 0 insertions(+), 13 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/bind10/bind10_src.py.in b/src/bin/bind10/bind10_src.py.in
index 68ff97b..4b169c8 100755
--- a/src/bin/bind10/bind10_src.py.in
+++ b/src/bin/bind10/bind10_src.py.in
@@ -239,10 +239,6 @@ class BoB:
         """
         self.cc_session = None
         self.ccs = None
-        self.cfg_start_auth = True
-        self.cfg_start_resolver = False
-        self.cfg_start_dhcp6 = False
-        self.cfg_start_dhcp4 = False
         self.curproc = None
         # XXX: Not used now, waits for reintroduction of restarts.
         self.dead_processes = {}
diff --git a/src/bin/bind10/tests/bind10_test.py.in b/src/bin/bind10/tests/bind10_test.py.in
index e323113..c320849 100644
--- a/src/bin/bind10/tests/bind10_test.py.in
+++ b/src/bin/bind10/tests/bind10_test.py.in
@@ -110,11 +110,6 @@ class TestBoB(unittest.TestCase):
         self.assertEqual(bob.uid, None)
         self.assertEqual(bob.username, None)
         self.assertEqual(bob.nocache, False)
-        self.assertEqual(bob.cfg_start_auth, True)
-        self.assertEqual(bob.cfg_start_resolver, False)
-
-        self.assertEqual(bob.cfg_start_dhcp4, False)
-        self.assertEqual(bob.cfg_start_dhcp6, False)
 
     def test_init_alternate_socket(self):
         bob = BoB("alt_socket_file")
@@ -128,10 +123,6 @@ class TestBoB(unittest.TestCase):
         self.assertEqual(bob.uid, None)
         self.assertEqual(bob.username, None)
         self.assertEqual(bob.nocache, False)
-        self.assertEqual(bob.cfg_start_auth, True)
-        self.assertEqual(bob.cfg_start_resolver, False)
-        self.assertEqual(bob.cfg_start_dhcp4, False)
-        self.assertEqual(bob.cfg_start_dhcp6, False)
 
     def test_command_handler(self):
         class DummySession():