diff --git a/daemon/acl_list.c b/daemon/acl_list.c index a37c8b0e6..f7d71b9fd 100644 --- a/daemon/acl_list.c +++ b/daemon/acl_list.c @@ -234,8 +234,7 @@ check_data(const char* data, const struct config_strlist* head) size_t len = sizeof(rr); int res; /* '.' is sufficient for validation, and it makes the call to - * sldns_wirerr_get_type() simpler below. - * (once adopted, this comment can be removed) */ + * sldns_wirerr_get_type() simpler below. */ snprintf(buf, sizeof(buf), "%s %s", ".", data); res = sldns_str2wire_rr_buf(buf, rr, &len, NULL, 3600, NULL, 0, NULL, 0); diff --git a/doc/Changelog b/doc/Changelog index 178959817..623757486 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,6 +1,7 @@ 18 October 2016: Wouter - Patch that resolves CNAMEs entered in local-data conf statements that point to data on the internet, from Jinmei Tatuya (Infoblox). + - Removed patch comments from acllist.c and msgencode.c 17 October 2016: Wouter - Re-fix #839 from view commit overwrite. diff --git a/util/data/msgencode.c b/util/data/msgencode.c index cecc8d8e1..5d3a24762 100644 --- a/util/data/msgencode.c +++ b/util/data/msgencode.c @@ -538,10 +538,7 @@ insert_section(struct reply_info* rep, size_t num_rrsets, uint16_t* num_rrs, /* we now allow this function to be called multiple times for the * same section, incrementally updating num_rrs. The caller is * responsible for initializing it (which is the case in the current - * implementation). - * Note: once approved, this comment and the following line should be - * removed. */ - /**num_rrs = 0;*/ + * implementation). */ if(s != LDNS_SECTION_ADDITIONAL) { if(s == LDNS_SECTION_ANSWER && qtype == LDNS_RR_TYPE_ANY)