remove spurious newlines in zone.c logging

3365.	[bug]		Removed spurious newlines from log messages in
			zone.c [RT #30675]

diff --git a/CHANGES b/CHANGES
index e3ad7c6620eec45857bf494ac3e928ad9a2d56af..eb2badc6f48eb1ce61ae44888bda8e620c4c4d01 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3365.  [bug]           Removed spurious newlines from log messages in
+                       zone.c [RT #30675]
+
 3364.  [security]      Named could die on specially crafted record.
                        [RT #30416]
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index c5f5c52f37432699b50bd3781a3199c46490a3d6..d78c6063f30f836e7411124acde0dc7e0d1caadc 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -3392,7 +3392,7 @@ zone_journal(dns_zone_t *zone, dns_diff_t *diff, isc_uint32_t *sourceserial,
                                          &journal);
                if (result != ISC_R_SUCCESS) {
                        dns_zone_log(zone, ISC_LOG_ERROR,
-                                    "%s:dns_journal_open -> %s\n",
+                                    "%s:dns_journal_open -> %s",
                                     caller, dns_result_totext(result));
                        return (result);
                }
@@ -3403,7 +3403,7 @@ zone_journal(dns_zone_t *zone, dns_diff_t *diff, isc_uint32_t *sourceserial,
                result = dns_journal_write_transaction(journal, diff);
                if (result != ISC_R_SUCCESS) {
                        dns_zone_log(zone, ISC_LOG_ERROR,
-                                    "%s:dns_journal_write_transaction -> %s\n",
+                                    "%s:dns_journal_write_transaction -> %s",
                                     caller, dns_result_totext(result));
                }
                dns_journal_destroy(&journal);
@@ -3429,7 +3429,7 @@ add_soa(dns_zone_t *zone, dns_db_t *db) {
        result = dns_db_newversion(db, &ver);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "add_soa:dns_db_newversion -> %s\n",
+                            "add_soa:dns_db_newversion -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -3439,7 +3439,7 @@ add_soa(dns_zone_t *zone, dns_db_t *db) {
                                    0, 0, 0, 0, 0, buf, &rdata);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "add_soa:dns_soa_buildrdata -> %s\n",
+                            "add_soa:dns_soa_buildrdata -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -3491,7 +3491,7 @@ sync_keyzone(dns_zone_t *zone, dns_db_t *db) {
        result = dns_db_newversion(db, &ver);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "sync_keyzone:dns_db_newversion -> %s\n",
+                            "sync_keyzone:dns_db_newversion -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -5457,7 +5457,7 @@ zone_resigninc(dns_zone_t *zone) {
        result = dns_db_newversion(db, &version);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_resigninc:dns_db_newversion -> %s\n",
+                            "zone_resigninc:dns_db_newversion -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -5466,7 +5466,7 @@ zone_resigninc(dns_zone_t *zone) {
                                zone_keys, &nkeys);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_resigninc:find_zone_keys -> %s\n",
+                            "zone_resigninc:find_zone_keys -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -5490,7 +5490,7 @@ zone_resigninc(dns_zone_t *zone) {
        result = dns_db_getsigningtime(db, &rdataset, name);
        if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_resigninc:dns_db_getsigningtime -> %s\n",
+                            "zone_resigninc:dns_db_getsigningtime -> %s",
                             dns_result_totext(result));
        }
 
@@ -5514,7 +5514,7 @@ zone_resigninc(dns_zone_t *zone) {
                                  zone_keys, nkeys, now, ISC_TRUE);
                if (result != ISC_R_SUCCESS) {
                        dns_zone_log(zone, ISC_LOG_ERROR,
-                                    "zone_resigninc:del_sigs -> %s\n",
+                                    "zone_resigninc:del_sigs -> %s",
                                     dns_result_totext(result));
                        break;
                }
@@ -5524,7 +5524,7 @@ zone_resigninc(dns_zone_t *zone) {
                                  expire, check_ksk, keyset_kskonly);
                if (result != ISC_R_SUCCESS) {
                        dns_zone_log(zone, ISC_LOG_ERROR,
-                                    "zone_resigninc:add_sigs -> %s\n",
+                                    "zone_resigninc:add_sigs -> %s",
                                     dns_result_totext(result));
                        break;
                }
@@ -5536,7 +5536,7 @@ zone_resigninc(dns_zone_t *zone) {
                }
                if (result != ISC_R_SUCCESS)
                        dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_resigninc:dns_db_getsigningtime -> %s\n",
+                            "zone_resigninc:dns_db_getsigningtime -> %s",
                                     dns_result_totext(result));
        }
 
@@ -5547,7 +5547,7 @@ zone_resigninc(dns_zone_t *zone) {
                          &sig_diff, zone_keys, nkeys, now, ISC_TRUE);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_resigninc:del_sigs -> %s\n",
+                            "zone_resigninc:del_sigs -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -5563,7 +5563,7 @@ zone_resigninc(dns_zone_t *zone) {
                                   zone->updatemethod);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_resigninc:update_soa_serial -> %s\n",
+                            "zone_resigninc:update_soa_serial -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -5577,7 +5577,7 @@ zone_resigninc(dns_zone_t *zone) {
                          soaexpire, check_ksk, keyset_kskonly);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_resigninc:add_sigs -> %s\n",
+                            "zone_resigninc:add_sigs -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -6279,7 +6279,7 @@ update_sigs(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *version,
                                  zone_keys, nkeys, now, ISC_FALSE);
                if (result != ISC_R_SUCCESS) {
                        dns_zone_log(zone, ISC_LOG_ERROR,
-                                    "update_sigs:del_sigs -> %s\n",
+                                    "update_sigs:del_sigs -> %s",
                                     dns_result_totext(result));
                        return (result);
                }
@@ -6289,7 +6289,7 @@ update_sigs(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *version,
                                  expire, check_ksk, keyset_kskonly);
                if (result != ISC_R_SUCCESS) {
                        dns_zone_log(zone, ISC_LOG_ERROR,
-                                    "update_sigs:add_sigs -> %s\n",
+                                    "update_sigs:add_sigs -> %s",
                                     dns_result_totext(result));
                        return (result);
                }
@@ -6374,7 +6374,7 @@ zone_nsec3chain(dns_zone_t *zone) {
        result = dns_db_newversion(db, &version);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_nsec3chain:dns_db_newversion -> %s\n",
+                            "zone_nsec3chain:dns_db_newversion -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -6383,7 +6383,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                                DNS_MAXZONEKEYS, zone_keys, &nkeys);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_nsec3chain:find_zone_keys -> %s\n",
+                            "zone_nsec3chain:find_zone_keys -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -6529,7 +6529,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                                            &nsec3_diff);
                if (result != ISC_R_SUCCESS) {
                        dns_zone_log(zone, ISC_LOG_ERROR, "zone_nsec3chain:"
-                                    "dns_nsec3_addnsec3 -> %s\n",
+                                    "dns_nsec3_addnsec3 -> %s",
                                     dns_result_totext(result));
                        goto failure;
                }
@@ -6587,7 +6587,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                        } else if (result != ISC_R_SUCCESS) {
                                dns_zone_log(zone, ISC_LOG_ERROR,
                                             "zone_nsec3chain:"
-                                            "dns_dbiterator_next -> %s\n",
+                                            "dns_dbiterator_next -> %s",
                                             dns_result_totext(result));
                                goto failure;
                        } else if (delegation) {
@@ -6646,7 +6646,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                        if (result != ISC_R_SUCCESS) {
                                dns_zone_log(zone, ISC_LOG_ERROR,
                                             "zone_nsec3chain:"
-                                            "need_nsec_chain -> %s\n",
+                                            "need_nsec_chain -> %s",
                                             dns_result_totext(result));
                                goto failure;
                        }
@@ -6671,7 +6671,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                                if (result != ISC_R_SUCCESS) {
                                        dns_zone_log(zone, ISC_LOG_ERROR,
                                                     "zone_nsec3chain:"
-                                                    "fixup_nsec3param -> %s\n",
+                                                    "fixup_nsec3param -> %s",
                                                     dns_result_totext(result));
                                        goto failure;
                                }
@@ -6686,7 +6686,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                        if (result != ISC_R_SUCCESS) {
                                dns_zone_log(zone, ISC_LOG_ERROR,
                                             "zone_nsec3chain:"
-                                            "deletematchingnsec3 -> %s\n",
+                                            "deletematchingnsec3 -> %s",
                                             dns_result_totext(result));
                                goto failure;
                        }
@@ -6787,7 +6787,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                                if (result != ISC_R_SUCCESS) {
                                        dns_zone_log(zone, ISC_LOG_ERROR,
                                                     "zone_nsec3chain:"
-                                                    "fixup_nsec3param -> %s\n",
+                                                    "fixup_nsec3param -> %s",
                                                     dns_result_totext(result));
                                        goto failure;
                                }
@@ -6795,7 +6795,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                        } else if (result != ISC_R_SUCCESS) {
                                dns_zone_log(zone, ISC_LOG_ERROR,
                                             "zone_nsec3chain:"
-                                            "dns_dbiterator_next -> %s\n",
+                                            "dns_dbiterator_next -> %s",
                                             dns_result_totext(result));
                                goto failure;
                        } else if (delegation) {
@@ -6832,7 +6832,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                result = dns_db_allrdatasets(db, node, version, 0, &iterator);
                if (result != ISC_R_SUCCESS) {
                        dns_zone_log(zone, ISC_LOG_ERROR, "zone_nsec3chain:"
-                                    "dns_db_allrdatasets -> %s\n",
+                                    "dns_db_allrdatasets -> %s",
                                     dns_result_totext(result));
                        goto failure;
                }
@@ -6858,7 +6858,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                        if (result != ISC_R_SUCCESS) {
                                dns_zone_log(zone, ISC_LOG_ERROR,
                                             "zone_nsec3chain:"
-                                            "updatesecure -> %s\n",
+                                            "updatesecure -> %s",
                                             dns_result_totext(result));
                                goto failure;
                        }
@@ -6871,7 +6871,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                        if (result != ISC_R_SUCCESS) {
                                dns_zone_log(zone, ISC_LOG_ERROR,
                                             "zone_nsec3chain:"
-                                            "dns_nsec3_addnsec3s -> %s\n",
+                                            "dns_nsec3_addnsec3s -> %s",
                                             dns_result_totext(result));
                                goto failure;
                        }
@@ -6886,7 +6886,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                             check_ksk, keyset_kskonly, &sig_diff);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR, "zone_nsec3chain:"
-                            "update_sigs -> %s\n", dns_result_totext(result));
+                            "update_sigs -> %s", dns_result_totext(result));
                goto failure;
        }
 
@@ -6899,7 +6899,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                             check_ksk, keyset_kskonly, &sig_diff);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR, "zone_nsec3chain:"
-                            "update_sigs -> %s\n", dns_result_totext(result));
+                            "update_sigs -> %s", dns_result_totext(result));
                goto failure;
        }
 
@@ -6910,7 +6910,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                                      zone->minimum, ISC_FALSE, &nsec_diff);
                if (result != ISC_R_SUCCESS) {
                        dns_zone_log(zone, ISC_LOG_ERROR, "zone_nsec3chain:"
-                                    "updatesecure -> %s\n",
+                                    "updatesecure -> %s",
                                     dns_result_totext(result));
                        goto failure;
                }
@@ -6921,7 +6921,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                             check_ksk, keyset_kskonly, &sig_diff);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR, "zone_nsec3chain:"
-                            "update_sigs -> %s\n", dns_result_totext(result));
+                            "update_sigs -> %s", dns_result_totext(result));
                goto failure;
        }
 
@@ -6936,7 +6936,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                          &sig_diff, zone_keys, nkeys, now, ISC_FALSE);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR, "zone_nsec3chain:"
-                            "del_sigs -> %s\n", dns_result_totext(result));
+                            "del_sigs -> %s", dns_result_totext(result));
                goto failure;
        }
 
@@ -6944,7 +6944,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                                   zone->updatemethod);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR, "zone_nsec3chain:"
-                            "update_soa_serial -> %s\n",
+                            "update_soa_serial -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -6954,7 +6954,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                          soaexpire, check_ksk, keyset_kskonly);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR, "zone_nsec3chain:"
-                            "add_sigs -> %s\n", dns_result_totext(result));
+                            "add_sigs -> %s", dns_result_totext(result));
                goto failure;
        }
 
@@ -6998,7 +6998,7 @@ zone_nsec3chain(dns_zone_t *zone) {
 
  failure:
        if (result != ISC_R_SUCCESS)
-               dns_zone_log(zone, ISC_LOG_ERROR, "zone_nsec3chain: %s\n",
+               dns_zone_log(zone, ISC_LOG_ERROR, "zone_nsec3chain: %s",
                             dns_result_totext(result));
        /*
         * On error roll back the current nsec3chain.
@@ -7201,7 +7201,7 @@ zone_sign(dns_zone_t *zone) {
        result = dns_db_newversion(db, &version);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_sign:dns_db_newversion -> %s\n",
+                            "zone_sign:dns_db_newversion -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -7210,7 +7210,7 @@ zone_sign(dns_zone_t *zone) {
                                DNS_MAXZONEKEYS, zone_keys, &nkeys);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_sign:find_zone_keys -> %s\n",
+                            "zone_sign:find_zone_keys -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -7431,7 +7431,7 @@ zone_sign(dns_zone_t *zone) {
                                        if (result != ISC_R_SUCCESS) {
                                                dns_zone_log(zone,
                                                             ISC_LOG_ERROR,
-                                                   "updatesecure -> %s\n",
+                                                   "updatesecure -> %s",
                                                    dns_result_totext(result));
                                                goto failure;
                                        }
@@ -7443,8 +7443,7 @@ zone_sign(dns_zone_t *zone) {
                                                           &post_diff);
                                if (result != ISC_R_SUCCESS) {
                                        dns_zone_log(zone, ISC_LOG_ERROR,
-                                                    "updatesignwithkey "
-                                                    "-> %s\n",
+                                                    "updatesignwithkey -> %s",
                                                     dns_result_totext(result));
                                        goto failure;
                                }
@@ -7452,7 +7451,7 @@ zone_sign(dns_zone_t *zone) {
                                goto next_signing;
                        } else if (result != ISC_R_SUCCESS) {
                                dns_zone_log(zone, ISC_LOG_ERROR,
-                                       "zone_sign:dns_dbiterator_next -> %s\n",
+                                       "zone_sign:dns_dbiterator_next -> %s",
                                             dns_result_totext(result));
                                goto failure;
                        } else if (delegation) {
@@ -7478,7 +7477,7 @@ zone_sign(dns_zone_t *zone) {
                                     check_ksk, keyset_kskonly, &sig_diff);
                if (result != ISC_R_SUCCESS) {
                        dns_zone_log(zone, ISC_LOG_ERROR, "zone_sign:"
-                                    "update_sigs -> %s\n",
+                                    "update_sigs -> %s",
                                     dns_result_totext(result));
                        goto failure;
                }
@@ -7498,7 +7497,7 @@ zone_sign(dns_zone_t *zone) {
                          &sig_diff, zone_keys, nkeys, now, ISC_FALSE);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_sign:del_sigs -> %s\n",
+                            "zone_sign:del_sigs -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -7507,7 +7506,7 @@ zone_sign(dns_zone_t *zone) {
                                   zone->updatemethod);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_sign:update_soa_serial -> %s\n",
+                            "zone_sign:update_soa_serial -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -7521,7 +7520,7 @@ zone_sign(dns_zone_t *zone) {
                          soaexpire, check_ksk, keyset_kskonly);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_sign:add_sigs -> %s\n",
+                            "zone_sign:add_sigs -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -15236,7 +15235,7 @@ sign_apex(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
                                zone_keys, &nkeys);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "sign_apex:find_zone_keys -> %s\n",
+                            "sign_apex:find_zone_keys -> %s",
                             dns_result_totext(result));
                return (result);
        }
@@ -15267,7 +15266,7 @@ sign_apex(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
                                  zone_keys, nkeys, now, ISC_FALSE);
                if (result != ISC_R_SUCCESS) {
                        dns_zone_log(zone, ISC_LOG_ERROR,
-                                    "sign_apex:del_sigs -> %s\n",
+                                    "sign_apex:del_sigs -> %s",
                                     dns_result_totext(result));
                        goto failure;
                }
@@ -15277,7 +15276,7 @@ sign_apex(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
                                  keyset_kskonly);
                if (result != ISC_R_SUCCESS) {
                        dns_zone_log(zone, ISC_LOG_ERROR,
-                                    "sign_apex:add_sigs -> %s\n",
+                                    "sign_apex:add_sigs -> %s",
                                     dns_result_totext(result));
                        goto failure;
                }
@@ -15289,7 +15288,7 @@ sign_apex(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
 
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "sign_apex:update_sigs -> %s\n",
+                            "sign_apex:update_sigs -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -15990,7 +15989,7 @@ keydone(isc_task_t *task, isc_event_t *event) {
                result = dns_db_newversion(db, &newver);
                if (result != ISC_R_SUCCESS) {
                        dns_zone_log(zone, ISC_LOG_ERROR,
-                                    "keydone:dns_db_newversion -> %s\n",
+                                    "keydone:dns_db_newversion -> %s",
                                     dns_result_totext(result));
                        goto failure;
                }
@@ -16188,7 +16187,7 @@ setnsec3param(isc_task_t *task, isc_event_t *event) {
                result = dns_db_newversion(db, &newver);
                if (result != ISC_R_SUCCESS) {
                        dns_zone_log(zone, ISC_LOG_ERROR,
-                                    "setnsec3param:dns_db_newversion -> %s\n",
+                                    "setnsec3param:dns_db_newversion -> %s",
                                     dns_result_totext(result));
                        goto failure;
                }