mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Merge branch 'update-log-fix' into 'master'

Browse Source 
make update_log() work if zone is not set

See merge request isc-projects/bind9!831
This commit is contained in:
Mark Andrews
2018-10-03 02:18:10 -04:00
parent 33229e7fc5 395f6a1474
commit 8be7d6ac3c
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/ns/update.c
View File

@@ -269,24 +269,34 @@ update_log(ns_client_t *client, dns_zone_t *zone,
char namebuf[DNS_NAME_FORMATSIZE]; char namebuf[DNS_NAME_FORMATSIZE];
char classbuf[DNS_RDATACLASS_FORMATSIZE]; char classbuf[DNS_RDATACLASS_FORMATSIZE];
if (client == NULL || zone == NULL) if (client == NULL) {
return; return;
}
if (isc_log_wouldlog(ns_lctx, level) == false) if (isc_log_wouldlog(ns_lctx, level) == false) {
return; return;
}
dns_name_format(dns_zone_getorigin(zone), namebuf,
sizeof(namebuf));
dns_rdataclass_format(dns_zone_getclass(zone), classbuf,
sizeof(classbuf));
va_start(ap, fmt); va_start(ap, fmt);
vsnprintf(message, sizeof(message), fmt, ap); vsnprintf(message, sizeof(message), fmt, ap);
va_end(ap); va_end(ap);
ns_client_log(client, NS_LOGCATEGORY_UPDATE, NS_LOGMODULE_UPDATE, if (zone != NULL) {
dns_name_format(dns_zone_getorigin(zone), namebuf,
sizeof(namebuf));
dns_rdataclass_format(dns_zone_getclass(zone), classbuf,
sizeof(classbuf));
ns_client_log(client, NS_LOGCATEGORY_UPDATE,
NS_LOGMODULE_UPDATE,
level, "updating zone '%s/%s': %s", level, "updating zone '%s/%s': %s",
namebuf, classbuf, message); namebuf, classbuf, message);
} else {
ns_client_log(client, NS_LOGCATEGORY_UPDATE,
NS_LOGMODULE_UPDATE,
level, "%s", message);
}
} }
static void static void