[v9_9] Prevent junk from being logged when using "also-notify { <ip> key <keyname>; };"

(cherry picked from commit 4034b098d8)
This commit is contained in:
Michał Kępień 2017-11-08 09:21:23 +01:00
parent 14e1eac55c
commit dbda79e4ec

View file

@ -10322,13 +10322,13 @@ notify_send_toaddr(isc_task_t *task, isc_event_t *event) {
if (result != ISC_R_SUCCESS)
goto cleanup;
isc_sockaddr_format(&notify->dst, addrbuf, sizeof(addrbuf));
if (notify->key != NULL) {
/* Transfer ownership of key */
key = notify->key;
notify->key = NULL;
} else {
isc_netaddr_fromsockaddr(&dstip, &notify->dst);
isc_sockaddr_format(&notify->dst, addrbuf, sizeof(addrbuf));
result = dns_view_getpeertsig(notify->zone->view, &dstip, &key);
if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND) {
notify_log(notify->zone, ISC_LOG_ERROR,