BIND 10 master, updated. 161d460bd035d7855f55d87b2d18f861d35c97a9 Add ChangeLog entry fro #3099

[BIND 10 source code commits]

The branch, master has been updated
       via  161d460bd035d7855f55d87b2d18f861d35c97a9 (commit)
       via  0ba8bbabe09756a4627e80aacdbb5050407faaac (commit)
       via  caeaa6012506f8ccbe2432fb1f049f6ae9709586 (commit)
       via  14e0986a46342c74398bcac8618bace081b956d9 (commit)
      from  cb81101a054cf68bcd374b218092c2da3c611999 (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 161d460bd035d7855f55d87b2d18f861d35c97a9
Author: Shane Kerr <shane at time-travellers.org>
Date:   Wed Jan 29 16:24:08 2014 +0100

    Add ChangeLog entry fro #3099

commit 0ba8bbabe09756a4627e80aacdbb5050407faaac
Merge: cb81101 caeaa60
Author: Shane Kerr <shane at time-travellers.org>
Date:   Wed Jan 29 16:19:56 2014 +0100

    Merge branch 'trac3099'

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

Summary of changes:
 ChangeLog                        |    5 +++++
 src/bin/xfrin/xfrin.py.in        |    3 ++-
 src/bin/xfrin/xfrin_messages.mes |    6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 410ccca..354a102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+741.    [bug]       shane
+	Remove hard-coded (and unnecessary) TSIG key from error message. 
+	This also prevents a crash if the TSIG name is missing.
+	(Trac #3099, git 0ba8bbabe09756a4627e80aacdbb5050407faaac)
+
 740.	[func]		muks
 	When displaying messages about mismatched configuration data types
 	in entered values (between the supplied value type and expected
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index a894d55..b8b457e 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -727,8 +727,9 @@ class XfrinConnection(asyncore.dispatcher):
             self.connect(self._master_addrinfo[2])
             return True
         except socket.error as e:
-            logger.error(XFRIN_CONNECT_MASTER, self.tsig_key_name,
+            logger.error(XFRIN_CONNECT_MASTER,
                          self._master_addrinfo[2],
+                         self._zone_name.to_text(),
                          str(e))
             return False
 
diff --git a/src/bin/xfrin/xfrin_messages.mes b/src/bin/xfrin/xfrin_messages.mes
index 4383324..6dc719f 100644
--- a/src/bin/xfrin/xfrin_messages.mes
+++ b/src/bin/xfrin/xfrin_messages.mes
@@ -56,9 +56,9 @@ most likely cause is that xfrin the msgq daemon is not running.
 There was an error while the given command was being processed. The
 error is given in the log message.
 
-% XFRIN_CONNECT_MASTER (with TSIG %1) error connecting to master at %2: %3
-There was an error opening a connection to the master. The error is
-shown in the log message.
+% XFRIN_CONNECT_MASTER error connecting to master at %1 for %2: %3
+There was an error opening a connection to the master for the specified
+zone. The error is shown in the log message.
 
 % XFRIN_DATASRC_CONFIG_ERROR failed to update data source configuration: %1
 Configuration for the global data sources is updated, but the update