Add zone context to "generated salt" logs

diff --git a/bin/named/server.c b/bin/named/server.c
index db7a3062f23e51dbe61f1a9b229d45213e53d752..f4ed7fb8787d131817de81281fdcd38ff4f8401b 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -14369,6 +14369,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;
@@ -14452,10 +14453,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;
 
@@ -14493,6 +14491,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 221c9545227b6c90294cffff0ad5b98d76ea885f..cca3feb38116d2f6c24faee22dbc593124b0d815 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -1573,6 +1573,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(
@@ -1586,7 +1591,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,