From: Shane Kerr <shane@time-travellers.org>
Date: Tue, 27 Aug 2013 11:16:49 +0000 (+0200)
Subject: Remove hard-coded (and unecessary) TSIG key from error message.
X-Git-Tag: bind10-1.2.0beta1-release~98^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=caeaa6012506f8ccbe2432fb1f049f6ae9709586;p=thirdparty%2Fkea.git

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

diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 57f44db2e9..6beeb409a3 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 fe368b9c00..6dc719f952 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.