BIND 10 trac3099, updated. caeaa6012506f8ccbe2432fb1f049f6ae9709586 Remove hard-coded (and unecessary) TSIG key from error message.

[BIND 10 source code commits]

The branch, trac3099 has been updated
       via  caeaa6012506f8ccbe2432fb1f049f6ae9709586 (commit)
      from  14e0986a46342c74398bcac8618bace081b956d9 (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 caeaa6012506f8ccbe2432fb1f049f6ae9709586
Author: Shane Kerr <shane at time-travellers.org>
Date:   Tue Aug 27 13:16:49 2013 +0200

    Remove hard-coded (and unecessary) TSIG key from error message.

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

Summary of changes:
 src/bin/xfrin/xfrin.py.in        |    5 -----
 src/bin/xfrin/xfrin_messages.mes |    2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 57f44db..6beeb40 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -652,13 +652,8 @@ class XfrinConnection(asyncore.dispatcher):
             self.connect(self._master_addrinfo[2])
             return True
         except socket.error as e:
-            if self._tsig_key is None:
-                tsig_str = ""
-            else:
-                tsig_str = " (with TSIG %s)" % self._tsig_key
             logger.error(XFRIN_CONNECT_MASTER,
                          self._master_addrinfo[2],
-                         tsig_str,
                          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 fe368b9..6dc719f 100644
--- a/src/bin/xfrin/xfrin_messages.mes
+++ b/src/bin/xfrin/xfrin_messages.mes
@@ -56,7 +56,7 @@ 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 error connecting to master at %1%2 for %3: %4
+% 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.