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 57f44db2e97dad78353e672dbd71a61cd0eabef7..6beeb409a303e3e4f97116dfe9fca4a92b4f6968 100755 (executable)
--- 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 fe368b9c008a064933282500f810527b272e0bff..6dc719f9524dcc274497eae7276628d75e90f8f6 100644 (file)
--- 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.