BIND 10 trac2025_2, updated. e4743cb6128e5a2a346fcbcbef7a8c9796934e01 [2025] Cleanup code

[BIND 10 source code commits]

The branch, trac2025_2 has been updated
       via  e4743cb6128e5a2a346fcbcbef7a8c9796934e01 (commit)
       via  d8a478581147fe220b6b4e5425e2570021a7d2b5 (commit)
      from  9b410a87bfebfb3329e30f5949070a81bb22235a (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 e4743cb6128e5a2a346fcbcbef7a8c9796934e01
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Jun 27 07:42:34 2012 +0530

    [2025] Cleanup code

commit d8a478581147fe220b6b4e5425e2570021a7d2b5
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Jun 27 07:42:15 2012 +0530

    [2025] Rename test_notify_slaves to also_notify

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

Summary of changes:
 src/bin/xfrout/xfrout.py.in                        |    5 +++--
 src/bin/xfrout/xfrout.spec.pre.in                  |    4 ++--
 src/lib/python/isc/notify/notify_out.py            |    5 ++---
 .../configurations/xfrin/retransfer_master.conf    |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/xfrout/xfrout.py.in b/src/bin/xfrout/xfrout.py.in
index 2e06128..6576432 100755
--- a/src/bin/xfrout/xfrout.py.in
+++ b/src/bin/xfrout/xfrout.py.in
@@ -952,8 +952,9 @@ class XfroutServer:
     def _start_notifier(self):
         datasrc = self._unix_socket_server.get_db_file()
         self._notifier = notify_out.NotifyOut(datasrc)
-        for slave in self._config_data['test_notify_slaves']:
-            self._notifier.add_slave(slave['address'], slave['port'])
+        if 'also_notify' in self._config_data:
+            for slave in self._config_data['also_notify']:
+                self._notifier.add_slave(slave['address'], slave['port'])
         self._notifier.dispatcher()
 
     def send_notify(self, zone_name, zone_class):
diff --git a/src/bin/xfrout/xfrout.spec.pre.in b/src/bin/xfrout/xfrout.spec.pre.in
index f31c9df..dfcc6d9 100644
--- a/src/bin/xfrout/xfrout.spec.pre.in
+++ b/src/bin/xfrout/xfrout.spec.pre.in
@@ -21,13 +21,13 @@
          }
        },
        {
-         "item_name": "test_notify_slaves",
+         "item_name": "also_notify",
          "item_type": "list",
          "item_optional": true,
          "item_default": [],
          "list_item_spec":
          {
-             "item_name": "test_notify_slaves_element",
+             "item_name": "also_notify_element",
              "item_type": "map",
              "item_optional": true,
              "item_default": {},
diff --git a/src/lib/python/isc/notify/notify_out.py b/src/lib/python/isc/notify/notify_out.py
index 160dffc..34db14c 100644
--- a/src/lib/python/isc/notify/notify_out.py
+++ b/src/lib/python/isc/notify/notify_out.py
@@ -164,9 +164,8 @@ class NotifyOut:
     def add_slave(self, address, port):
         for zone_name, zone_class in sqlite3_ds.get_zones_info(self._db_file):
             zone_id = (zone_name, zone_class)
-            if zone_id not in self._notify_infos:
-                continue
-            self._notify_infos[zone_id].notify_slaves.append((address, port))
+            if zone_id in self._notify_infos:
+                self._notify_infos[zone_id].notify_slaves.append((address, port))
 
     def send_notify(self, zone_name, zone_class='IN'):
         '''Send notify to one zone's slaves, this function is
diff --git a/tests/lettuce/configurations/xfrin/retransfer_master.conf b/tests/lettuce/configurations/xfrin/retransfer_master.conf
index 5efd133..378cff9 100644
--- a/tests/lettuce/configurations/xfrin/retransfer_master.conf
+++ b/tests/lettuce/configurations/xfrin/retransfer_master.conf
@@ -18,7 +18,7 @@
         "zone_config": [ {
             "origin": "example.org"
         } ],
-        "test_notify_slaves": [ {
+        "also_notify": [ {
             "address": "::1",
             "port": 47806
         } ]