Parcourir la source

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

Shane Kerr il y a 11 ans
Parent
commit
caeaa60125
2 fichiers modifiés avec 1 ajouts et 6 suppressions
  1. 0 5
      src/bin/xfrin/xfrin.py.in
  2. 1 1
      src/bin/xfrin/xfrin_messages.mes

+ 0 - 5
src/bin/xfrin/xfrin.py.in

@@ -652,13 +652,8 @@ class XfrinConnection(asyncore.dispatcher):
             self.connect(self._master_addrinfo[2])
             self.connect(self._master_addrinfo[2])
             return True
             return True
         except socket.error as e:
         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,
             logger.error(XFRIN_CONNECT_MASTER,
                          self._master_addrinfo[2],
                          self._master_addrinfo[2],
-                         tsig_str,
                          self._zone_name.to_text(),
                          self._zone_name.to_text(),
                          str(e))
                          str(e))
             return False
             return False

+ 1 - 1
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
 There was an error while the given command was being processed. The
 error is given in the log message.
 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
 There was an error opening a connection to the master for the specified
 zone. The error is shown in the log message.
 zone. The error is shown in the log message.