From 15cda6a21d7cc91cfe50745d8244d2c11f8a3d80 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Fri, 4 Sep 2015 16:19:33 +0200 Subject: [PATCH 1/6] Fix readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3d4513a6..07d2d2a2 100644 --- a/README.md +++ b/README.md @@ -96,8 +96,8 @@ package management system to install the compile time files. If you checked out our git you need to copy the libtool helper scripts and rebuild configure with: - # libtoolize -fi - # autoreconf -ci + # libtoolize -ci + # autoreconf -fi ## Extensions / Event loop dependencies From 6c7c5c9281e73e28ec28a200e7972e7ac0ccc450 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Fri, 4 Sep 2015 16:20:21 +0200 Subject: [PATCH 2/6] Bumb version --- ChangeLog | 3 +++ configure.ac | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8cd5fd6..534d149a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +* 2015-09-??: Version 0.3.3 + * Fix clearing upstream events on shutdown + * 2015-09-04: Version 0.3.2 * Fix returned upstreams list by getdns_context_get_api_information() * Fix some autoconf issues when srcdir != builddir diff --git a/configure.ac b/configure.ac index b78c9927..9630e37a 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,7 @@ sinclude(./m4/acx_openssl.m4) sinclude(./m4/ax_check_compile_flag.m4) sinclude(./m4/pkg.m4) -AC_INIT([getdns], [0.3.2], [stub-resolver@verisignlabs.com], [], [https://getdnsapi.net]) +AC_INIT([getdns], [0.3.3], [stub-resolver@verisignlabs.com], [], [https://getdnsapi.net]) AC_SUBST(RELEASE_CANDIDATE, []) # Set current date from system if not set @@ -46,7 +46,7 @@ AC_ARG_WITH([current-date], [CURRENT_DATE="`date -u +%Y-%m-%dT%H:%M:%SZ`"]) AC_SUBST(GETDNS_VERSION, ["AC_PACKAGE_VERSION$RELEASE_CANDIDATE"]) -AC_SUBST(GETDNS_NUMERIC_VERSION, [0x00030200]) +AC_SUBST(GETDNS_NUMERIC_VERSION, [0x00030300]) AC_SUBST(API_VERSION, ["July 2015"]) AC_SUBST(API_NUMERIC_VERSION, [0x07df0700]) GETDNS_COMPILATION_COMMENT="AC_PACKAGE_NAME $GETDNS_VERSION configured on $CURRENT_DATE for the $API_VERSION version of the API" @@ -71,9 +71,10 @@ GETDNS_COMPILATION_COMMENT="AC_PACKAGE_NAME $GETDNS_VERSION configured on $CURRE # getdns-0.2.0 had libversion 2:2:1 # getdns-0.3.0 had libversion 3:3:2 # getdns-0.3.1 had libversion 3:4:2 -# getdns-0.3.2 has libversion 3:5:2 +# getdns-0.3.2 had libversion 3:5:2 +# getdns-0.3.3 has libversion 3:6:2 # -GETDNS_LIBVERSION=3:5:2 +GETDNS_LIBVERSION=3:6:2 AC_SUBST(GETDNS_COMPILATION_COMMENT) AC_SUBST(GETDNS_LIBVERSION) From 560f168460355be8f09e706a00f1d4b6e21660a4 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Tue, 8 Sep 2015 10:31:06 +0200 Subject: [PATCH 3/6] Have a release candidate first --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 9630e37a..342ff15e 100644 --- a/configure.ac +++ b/configure.ac @@ -35,8 +35,8 @@ sinclude(./m4/acx_openssl.m4) sinclude(./m4/ax_check_compile_flag.m4) sinclude(./m4/pkg.m4) -AC_INIT([getdns], [0.3.3], [stub-resolver@verisignlabs.com], [], [https://getdnsapi.net]) -AC_SUBST(RELEASE_CANDIDATE, []) +AC_INIT([getdns], [0.3.2], [stub-resolver@verisignlabs.com], [], [https://getdnsapi.net]) +AC_SUBST(RELEASE_CANDIDATE, [rc1]) # Set current date from system if not set AC_ARG_WITH([current-date], @@ -46,7 +46,7 @@ AC_ARG_WITH([current-date], [CURRENT_DATE="`date -u +%Y-%m-%dT%H:%M:%SZ`"]) AC_SUBST(GETDNS_VERSION, ["AC_PACKAGE_VERSION$RELEASE_CANDIDATE"]) -AC_SUBST(GETDNS_NUMERIC_VERSION, [0x00030300]) +AC_SUBST(GETDNS_NUMERIC_VERSION, [0x00030201]) AC_SUBST(API_VERSION, ["July 2015"]) AC_SUBST(API_NUMERIC_VERSION, [0x07df0700]) GETDNS_COMPILATION_COMMENT="AC_PACKAGE_NAME $GETDNS_VERSION configured on $CURRENT_DATE for the $API_VERSION version of the API" @@ -72,7 +72,7 @@ GETDNS_COMPILATION_COMMENT="AC_PACKAGE_NAME $GETDNS_VERSION configured on $CURRE # getdns-0.3.0 had libversion 3:3:2 # getdns-0.3.1 had libversion 3:4:2 # getdns-0.3.2 had libversion 3:5:2 -# getdns-0.3.3 has libversion 3:6:2 +# getdns-0.3.3 will have libversion 3:6:2 # GETDNS_LIBVERSION=3:6:2 From 46ea366f5f50731365f87192b871b6316577ba9f Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Tue, 8 Sep 2015 10:52:04 +0200 Subject: [PATCH 4/6] Fix dnssec validation of direct CNAME queries Thanks Simson L. Garfinkel. --- ChangeLog | 4 +++- src/dnssec.c | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 534d149a..8f7da390 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ * 2015-09-??: Version 0.3.3 * Fix clearing upstream events on shutdown - + * Fix dnssec validation of direct CNAME queries. + Thanks Simson L. Garfinkel. + * 2015-09-04: Version 0.3.2 * Fix returned upstreams list by getdns_context_get_api_information() * Fix some autoconf issues when srcdir != builddir diff --git a/src/dnssec.c b/src/dnssec.c index f72f3066..967e1aec 100644 --- a/src/dnssec.c +++ b/src/dnssec.c @@ -1065,8 +1065,17 @@ static void add_question2val_chain(struct mem_funcs *mf, q_rrset.name = _getdns_rdf_if_or_as_decompressed( rdf, cname_spc, &cname_len); } + + /* If the qtype was a CNAME, and we got one, we'r done. + * We asked for it directly, so no redirection applies. + * Otherwise we have to check the refered to name/qtype. + */ + if (qtype == GETDNS_RRTYPE_CNAME && q_rrset.name != qname) + return; + q_rrset.rr_type = qtype; if (!(rr = rrtype_iter_init(&rr_spc, &q_rrset))) { + /* No answer for the question. Add a head for this rrset * anyway, to validate proof of non-existance, or to find * proof that the packet is insecure. From 84ad5850c95196ae3b4831ed2836365d967df26a Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Tue, 8 Sep 2015 11:20:52 +0200 Subject: [PATCH 5/6] get_api_information():version_string also for RCs --- ChangeLog | 1 + src/context.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8f7da390..1ac54fdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ * Fix clearing upstream events on shutdown * Fix dnssec validation of direct CNAME queries. Thanks Simson L. Garfinkel. + * Fix get_api_information():version_string also for release candidates * 2015-09-04: Version 0.3.2 * Fix returned upstreams list by getdns_context_get_api_information() diff --git a/src/context.c b/src/context.c index 9cb23a75..e456f362 100644 --- a/src/context.c +++ b/src/context.c @@ -2495,7 +2495,7 @@ getdns_context_get_api_information(getdns_context* context) { if (!result) { return NULL; } - r = getdns_dict_util_set_string(result, "version_string", PACKAGE_VERSION); + r = getdns_dict_util_set_string(result, "version_string", GETDNS_VERSION); r |= getdns_dict_util_set_string(result, "implementation_string", PACKAGE_URL); r |= getdns_dict_set_int(result, "resolution_type", context->resolution_type); settings = _get_context_settings(context); From a543c239268c0a0e12caa25c0d80752e5e5c5109 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Tue, 8 Sep 2015 11:24:45 +0200 Subject: [PATCH 6/6] Spelling --- src/dnssec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dnssec.c b/src/dnssec.c index 967e1aec..e5cc4a4a 100644 --- a/src/dnssec.c +++ b/src/dnssec.c @@ -1068,7 +1068,7 @@ static void add_question2val_chain(struct mem_funcs *mf, /* If the qtype was a CNAME, and we got one, we'r done. * We asked for it directly, so no redirection applies. - * Otherwise we have to check the refered to name/qtype. + * Otherwise we have to check the referred to name/qtype. */ if (qtype == GETDNS_RRTYPE_CNAME && q_rrset.name != qname) return;