tests-extra: fix NOTIFY over TLS from Bind

diff --git a/tests-extra/tools/dnstest/server.py b/tests-extra/tools/dnstest/server.py
index 633e2c64a59b106e2a57ee89f060b8eede6ecf4a..89734161e23bc5aee07a7c9e6890fa6736e36b69 100644 (file)
--- a/tests-extra/tools/dnstest/server.py
+++ b/tests-extra/tools/dnstest/server.py
@@ -1327,6 +1327,16 @@ class Bind(Server):
                 for slave in z.slaves:
                     if self.disable_notify:
                         continue
                 for slave in z.slaves:
                     if self.disable_notify:
                         continue

+                    if self.tsig:
+                        slaves += "%s port %i key %s" \
+                                  % (slave.addr, slave.tls_port or slave.port, self.tsig.name)
+                    else:
+                        slaves += "%s port %i" % (slave.addr, slave.tls_port or slave.port)
+                    if slave.tls_port:
+                        slaves += " tls %s" % (slave.name if slave.cert_key_file else "ephemeral")
+                    slaves += "; "
+
+                    # START - workaround for older Bind versions, remove in the future

                     if self.tsig:
                         slaves += "%s port %s key %s" \
                                   % (slave.addr, slave.port, self.tsig.name)
                     if self.tsig:
                         slaves += "%s port %s key %s" \
                                   % (slave.addr, slave.port, self.tsig.name)


@@ -1335,6 +1345,7 @@ class Bind(Server):
                     if slave.tls_port:
                         slaves += " tls %s" % (slave.name if slave.cert_key_file else "ephemeral")
                     slaves += "; "
                     if slave.tls_port:
                         slaves += " tls %s" % (slave.name if slave.cert_key_file else "ephemeral")
                     slaves += "; "

+                    # END

                 if slaves:
                     s.item("also-notify", "{ %s}" % slaves)
 
                 if slaves:
                     s.item("also-notify", "{ %s}" % slaves)