Don't crash with missing TSIG name

diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 16c8532fd08585e2be5e7b6295bf208ab48c0f1d..57f44db2e97dad78353e672dbd71a61cd0eabef7 100755 (executable)
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -652,8 +652,14 @@ 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,
+            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 4383324f797eec8ff4362085fa431ebfff40d488..fe368b9c008a064933282500f810527b272e0bff 100644 (file)
--- 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%2 for %3: %4
+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