upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-02 13:30:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add zone context to "generated salt" logs

Browse source 
(cherry picked from commit 3b4c764b43)
This commit is contained in:
Matthijs Mekking 2020-11-04 16:30:19 +01:00
parent 93f9d3b812
commit 734865e110
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bin/named/server.c
View file

@ -14328,6 +14328,7 @@ named_server_signing(named_server_t *server, isc_lex_t *lex,
bool list = false, clear = false;
bool chain = false;
bool setserial = false;
bool log_salt = false;
uint32_t serial = 0;
char keystr[DNS_SECALG_FORMATSIZE + 7]; /* <5-digit keyid>/<alg> */
unsigned short hash = 0, flags = 0, iter = 0, saltlen = 0;
@ -14411,10 +14412,7 @@ named_server_signing(named_server_t *server, isc_lex_t *lex,
*/
saltlen = 8;
CHECK(dns_nsec3_generate_salt(salt, saltlen));
dns_nsec3_log_salt(
named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER, ISC_LOG_INFO,
salt, saltlen, "generated salt:");
log_salt = true;
} else if (strcmp(ptr, "-") != 0) {
isc_buffer_t buf;
@ -14452,6 +14450,16 @@ named_server_signing(named_server_t *server, isc_lex_t *lex,
(void)putstr(text, "request queued");
(void)putnull(text);
} else if (chain) {
if (log_salt) {
char zonetext[DNS_NAME_MAXTEXT + 32];
dns_zone_name(zone, zonetext, sizeof(zonetext));
dns_nsec3_log_salt(
named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, salt,
saltlen,
"generated salt for zone %s:", zonetext);
}
CHECK(dns_zone_setnsec3param(zone, (uint8_t)hash,
(uint8_t)flags, iter,
(uint8_t)saltlen, salt, true));

9
bin/named/zoneconf.c
View file

@ -1541,6 +1541,11 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
dns_kasp_nsec3saltlen(kasp), NULL);
if (result != ISC_R_SUCCESS) {
if (dns_kasp_nsec3saltlen(kasp) > 0) {
char zonetext[DNS_NAME_MAXTEXT +
32];
dns_zone_name(zone, zonetext,
sizeof(zonetext));
RETERR(dns_nsec3_generate_salt(
saltbuf,
dns_kasp_nsec3saltlen(
@ -1554,7 +1559,9 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
ISC_LOG_INFO, salt,
dns_kasp_nsec3saltlen(
kasp),
"generated salt:");
"generated salt for "
"zone %s:",
zonetext);
}
result = dns_zone_setnsec3param(
zone, 1,