Add zone context to "generated salt" logs

(cherry picked from commit 3b4c764b437896372f2cf12d8ba8b8e8238742a2)

diff --git a/bin/named/server.c b/bin/named/server.c
index 01369c0933910fab827a11cf1b5ea3a73215996f..bfca3c1153e4de9beb8fb0dad34be8472d309982 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -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));

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index c52795fca831ce4f481598c2279dc81efb5bc954..af797fc82ed15d5f7995a26c47331f69f8e87529 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -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,