BIND 10 master, updated. 8acbf043daf590a9f2ad003e715cd4ffb0b3f979 Merge branch 'trac2925'

[BIND 10 source code commits]

The branch, master has been updated
       via  8acbf043daf590a9f2ad003e715cd4ffb0b3f979 (commit)
       via  51e0b7424c7b3992e1bec9d524c7554ab33f45ab (commit)
       via  99e8782450496aba1595fbee4058d0f1e5a4477d (commit)
      from  c989ea1255cfb2086655c86234270b10c55efdff (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 8acbf043daf590a9f2ad003e715cd4ffb0b3f979
Merge: c989ea1 51e0b74
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Jul 31 12:02:35 2013 +0530

    Merge branch 'trac2925'

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

Summary of changes:
 src/bin/xfrout/xfrout.py.in       |   10 +++++++++-
 src/bin/xfrout/xfrout.spec.pre.in |    2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/xfrout/xfrout.py.in b/src/bin/xfrout/xfrout.py.in
index ffa6535..bcb0d53 100755
--- a/src/bin/xfrout/xfrout.py.in
+++ b/src/bin/xfrout/xfrout.py.in
@@ -1018,6 +1018,8 @@ class UnixSockServer(socketserver_mixin.NoPollMixIn,
 
 class XfroutServer:
     def __init__(self):
+        self._default_notify_address = ''
+        self._default_notify_port = 53
         self._unix_socket_server = None
         self._listen_sock_file = UNIX_SOCKET_FILE
         self._shutdown_event = threading.Event()
@@ -1046,7 +1048,13 @@ class XfroutServer:
         self._notifier = notify_out.NotifyOut(datasrc)
         if 'also_notify' in self._config_data:
             for slave in self._config_data['also_notify']:
-                self._notifier.add_slave(slave['address'], slave['port'])
+                address = self._default_notify_address
+                if 'address' in slave:
+                    address = slave['address']
+                port = self._default_notify_port
+                if 'port' in slave:
+                    port = slave['port']
+                self._notifier.add_slave(address, 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 570f73e..dd90fe4 100644
--- a/src/bin/xfrout/xfrout.spec.pre.in
+++ b/src/bin/xfrout/xfrout.spec.pre.in
@@ -43,7 +43,7 @@
                    "item_name": "port",
                    "item_type": "integer",
                    "item_optional": false,
-                   "item_default": 0
+                   "item_default": 53
                }
              ]
          }