From 63c03cdb2d5ea425dd34c77c5d3291228b4dfffc Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 13 Feb 2019 15:57:03 +1100 Subject: [PATCH 1/5] remove seen_dname --- lib/dns/zone.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 467ad4ae54..a4e0f42e44 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -6946,8 +6946,7 @@ sign_a_node(dns_db_t *db, dns_name_t *name, dns_dbnode_t *node, dns_rdata_t rdata = DNS_RDATA_INIT; isc_buffer_t buffer; unsigned char data[1024]; - bool seen_soa, seen_ns, seen_rr, seen_dname, seen_nsec, - seen_nsec3, seen_ds; + bool seen_soa, seen_ns, seen_rr, seen_nsec, seen_nsec3, seen_ds; result = dns_db_allrdatasets(db, node, version, 0, &iterator); if (result != ISC_R_SUCCESS) { @@ -6958,8 +6957,7 @@ sign_a_node(dns_db_t *db, dns_name_t *name, dns_dbnode_t *node, dns_rdataset_init(&rdataset); isc_buffer_init(&buffer, data, sizeof(data)); - seen_rr = seen_soa = seen_ns = seen_dname = seen_nsec = - seen_nsec3 = seen_ds = false; + seen_rr = seen_soa = seen_ns = seen_nsec = seen_nsec3 = seen_ds = false; for (result = dns_rdatasetiter_first(iterator); result == ISC_R_SUCCESS; result = dns_rdatasetiter_next(iterator)) { @@ -6970,8 +6968,6 @@ sign_a_node(dns_db_t *db, dns_name_t *name, dns_dbnode_t *node, seen_ns = true; else if (rdataset.type == dns_rdatatype_ds) seen_ds = true; - else if (rdataset.type == dns_rdatatype_dname) - seen_dname = true; else if (rdataset.type == dns_rdatatype_nsec) seen_nsec = true; else if (rdataset.type == dns_rdatatype_nsec3) From 70fab477b11b63642e05e6e9ce1c998fe2a83add Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 13 Feb 2019 16:11:08 +1100 Subject: [PATCH 2/5] don't overwrite result --- bin/named/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/named/server.c b/bin/named/server.c index 2f941ce4f8..435be1ee0c 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -14712,7 +14712,7 @@ named_server_nta(named_server_t *server, isc_lex_t *lex, CHECK(ISC_R_NOTFOUND); } - CHECK(putnull(text)); + (void) putnull(text); cleanup: if (msg != NULL) { From 9a9dc4072f6365a3f80eab6497fc000281018aa7 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 13 Feb 2019 16:13:16 +1100 Subject: [PATCH 3/5] declarations before assertions --- lib/dns/catz.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/dns/catz.c b/lib/dns/catz.c index 3084f39b33..3a8c30edee 100644 --- a/lib/dns/catz.c +++ b/lib/dns/catz.c @@ -837,8 +837,9 @@ dns_catz_zone_detach(dns_catz_zone_t **zonep) { void dns_catz_catzs_detach(dns_catz_zones_t **catzsp) { + dns_catz_zones_t *catzs; + REQUIRE(catzsp != NULL && *catzsp != NULL); - dns_catz_zones_t *catzs = *catzsp; catzs = *catzsp; *catzsp = NULL; From 7b60f6832e702507f2cec23f22ab9cf4abacc1e4 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 13 Feb 2019 16:19:07 +1100 Subject: [PATCH 4/5] silence clang --- bin/dig/nslookup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index e61de912b2..bbabf0e0f5 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -901,7 +901,7 @@ parse_args(int argc, char **argv) { bool have_lookup = false; usesearch = true; - for (argc--, argv++; argc > 0; argc--, argv++) { + for (argc--, argv++; argc > 0 && argv[0] != NULL; argc--, argv++) { debug("main parsing %s", argv[0]); if (argv[0][0] == '-') { if (strncasecmp(argv[0], "-ver", 4) == 0) { From f475dc75b1e2d3745e3c5d056339330b4a274aa9 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 13 Feb 2019 16:22:01 +1100 Subject: [PATCH 5/5] remove redundant assignment --- lib/dns/gssapictx.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c index 6a6b2e3ab5..c5cb760351 100644 --- a/lib/dns/gssapictx.c +++ b/lib/dns/gssapictx.c @@ -487,7 +487,6 @@ dst_gssapi_identitymatchesrealmms(const dns_name_t *signer, */ rname++; *sname = '\0'; - sname = sbuf; if (strcmp(rname, rbuf) != 0) { return (false);