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 ad8597bca1ab6731861c873c598e7d0e21909406..b0a695642f089a7503b6dcffe323984f5ead58e7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3365.  [bug]           Removed spurious newlines from log messages in
+                       zone.c [RT #30675]
+
 3362.  [bug]           Setting some option values to 0 in named.conf
                        could trigger an assertion failure on startup.
                        [RT #27730]

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index baad4867d6a168be4d2b70dae27f06b3d8224799..84508ab039492883e312a57c7854dbcfaf8f0ea7 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -3075,7 +3075,7 @@ zone_journal(dns_zone_t *zone, dns_diff_t *diff, const char *caller) {
                                          ISC_TRUE, &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);
                }
@@ -3084,7 +3084,7 @@ zone_journal(dns_zone_t *zone, dns_diff_t *diff, const char *caller) {
                dns_journal_destroy(&journal);
                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));
                        return (result);
                }
@@ -3109,7 +3109,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;
        }
@@ -3119,7 +3119,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;
        }
@@ -3171,7 +3171,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;
        }
@@ -4920,7 +4920,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;
        }
@@ -4929,7 +4929,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;
        }
@@ -4953,7 +4953,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));
        }
 
@@ -4977,7 +4977,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;
                }
@@ -4987,7 +4987,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;
                }
@@ -4999,7 +4999,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));
        }
 
@@ -5010,7 +5010,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;
        }
@@ -5025,7 +5025,7 @@ zone_resigninc(dns_zone_t *zone) {
        result = increment_soa_serial(db, version, &sig_diff, zone->mctx);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_resigninc:increment_soa_serial -> %s\n",
+                            "zone_resigninc:increment_soa_serial -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -5039,7 +5039,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;
        }
@@ -5734,7 +5734,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);
                }
@@ -5744,7 +5744,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);
                }
@@ -5829,7 +5829,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;
        }
@@ -5838,7 +5838,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;
        }
@@ -5984,7 +5984,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;
                }
@@ -6042,7 +6042,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) {
@@ -6100,7 +6100,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;
                        }
@@ -6125,7 +6125,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;
                                }
@@ -6140,7 +6140,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;
                        }
@@ -6241,7 +6241,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;
                                }
@@ -6249,7 +6249,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) {
@@ -6286,7 +6286,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;
                }
@@ -6312,7 +6312,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;
                        }
@@ -6325,7 +6325,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;
                        }
@@ -6340,7 +6340,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;
        }
 
@@ -6353,7 +6353,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;
        }
 
@@ -6364,7 +6364,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;
                }
@@ -6375,7 +6375,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;
        }
 
@@ -6390,14 +6390,14 @@ 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;
        }
 
        result = increment_soa_serial(db, version, &sig_diff, zone->mctx);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR, "zone_nsec3chain:"
-                            "increment_soa_serial -> %s\n",
+                            "increment_soa_serial -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -6407,7 +6407,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;
        }
 
@@ -6451,7 +6451,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.
@@ -6654,7 +6654,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;
        }
@@ -6663,7 +6663,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;
        }
@@ -6884,7 +6884,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;
                                        }
@@ -6896,8 +6896,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;
                                }
@@ -6905,7 +6904,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) {
@@ -6931,7 +6930,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;
                }
@@ -6951,7 +6950,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;
        }
@@ -6959,7 +6958,7 @@ zone_sign(dns_zone_t *zone) {
        result = increment_soa_serial(db, version, &sig_diff, zone->mctx);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
-                            "zone_sign:increment_soa_serial -> %s\n",
+                            "zone_sign:increment_soa_serial -> %s",
                             dns_result_totext(result));
                goto failure;
        }
@@ -6973,7 +6972,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;
        }
@@ -13988,7 +13987,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);
        }
@@ -14019,7 +14018,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;
                }
@@ -14029,7 +14028,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;
                }
@@ -14041,7 +14040,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;
        }