diff options
| -rwxr-xr-x | RELNOTES | 7 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rwxr-xr-x | configure.ac | 2 | ||||
| -rwxr-xr-x | src/knot.conf.5 | 2 | ||||
| -rwxr-xr-x | src/knot/server/zones.c | 11 | ||||
| -rwxr-xr-x | src/knot/server/zones.h | 3 | ||||
| -rwxr-xr-x | src/knotc.8 | 2 | ||||
| -rwxr-xr-x | src/knotd.8 | 2 |
8 files changed, 29 insertions, 20 deletions
@@ -1,3 +1,10 @@ +v1.1.2 - Nov 21, 2012 +--------------------- + +Bugfixes + * Fixed debug message. + + v1.1.2-rc1 - Nov 14, 2012 ------------------------- @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for knot 1.1.2-rc1. +# Generated by GNU Autoconf 2.68 for knot 1.1.2. # # Report bugs to <knot-dns@labs.nic.cz>. # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='knot' PACKAGE_TARNAME='knot' -PACKAGE_VERSION='1.1.2-rc1' -PACKAGE_STRING='knot 1.1.2-rc1' +PACKAGE_VERSION='1.1.2' +PACKAGE_STRING='knot 1.1.2' PACKAGE_BUGREPORT='knot-dns@labs.nic.cz' PACKAGE_URL='' @@ -1300,7 +1300,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures knot 1.1.2-rc1 to adapt to many kinds of systems. +\`configure' configures knot 1.1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1370,7 +1370,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of knot 1.1.2-rc1:";; + short | recursive ) echo "Configuration of knot 1.1.2:";; esac cat <<\_ACEOF @@ -1488,7 +1488,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -knot configure 1.1.2-rc1 +knot configure 1.1.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2038,7 +2038,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by knot $as_me 1.1.2-rc1, which was +It was created by knot $as_me 1.1.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2856,7 +2856,7 @@ fi # Define the identity of the package. PACKAGE='knot' - VERSION='1.1.2-rc1' + VERSION='1.1.2' cat >>confdefs.h <<_ACEOF @@ -15108,7 +15108,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by knot $as_me 1.1.2-rc1, which was +This file was extended by knot $as_me 1.1.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15174,7 +15174,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -knot config.status 1.1.2-rc1 +knot config.status 1.1.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9230f1d..7ba09e9 100755 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- AC_PREREQ([2.60]) -AC_INIT([knot], [1.1.2-rc1], [knot-dns@labs.nic.cz]) +AC_INIT([knot], [1.1.2], [knot-dns@labs.nic.cz]) AM_INIT_AUTOMAKE([gnu -Wall -Werror]) AC_CONFIG_SRCDIR([src/knot/main.c]) AC_CONFIG_HEADERS([src/config.h]) diff --git a/src/knot.conf.5 b/src/knot.conf.5 index 4c3f367..47daa25 100755 --- a/src/knot.conf.5 +++ b/src/knot.conf.5 @@ -1,4 +1,4 @@ -.TH "knot.conf" "5" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.2-rc1" +.TH "knot.conf" "5" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.2" .SH "NAME" .LP .B knot.conf diff --git a/src/knot/server/zones.c b/src/knot/server/zones.c index d993c49..930f611 100755 --- a/src/knot/server/zones.c +++ b/src/knot/server/zones.c @@ -1987,7 +1987,8 @@ static int zones_check_tsig_query(const knot_zone_t *zone, // if there is some TSIG in the query, find the TSIG associated with // the zone dbg_zones_verb("Checking zone and ACL.\n"); - int ret = zones_query_check_zone(zone, addr, tsig_key_zone, rcode); + int ret = zones_query_check_zone(zone, addr, tsig_key_zone, rcode, + knot_packet_opcode(query)); /* Accept found OR unknown key results. */ @@ -2191,7 +2192,8 @@ int zones_zonefile_sync(knot_zone_t *zone, journal_t *journal) /*----------------------------------------------------------------------------*/ int zones_query_check_zone(const knot_zone_t *zone, const sockaddr_t *addr, - knot_key_t **tsig_key, knot_rcode_t *rcode) + knot_key_t **tsig_key, knot_rcode_t *rcode, + uint8_t q_opcode) { if (addr == NULL || tsig_key == NULL || rcode == NULL) { dbg_zones_verb("Wrong arguments.\n"); @@ -2217,8 +2219,7 @@ int zones_query_check_zone(const knot_zone_t *zone, const sockaddr_t *addr, return KNOT_EACCES; } else { dbg_zones("zones: authorized query or request for " - "'%s %s'. match=%p\n", zd->conf->name, match, - q_opcode == KNOT_OPCODE_UPDATE ? "UPDATE":"XFR/OUT"); + "'%s %s'. match=%p\n", zd->conf->name, "XFR/OUT", match); if (match) { /* Save configured TSIG key for comparison. */ conf_iface_t *iface = (conf_iface_t*)(match->val); @@ -2253,7 +2254,7 @@ int zones_xfr_check_zone(knot_ns_xfr_t *xfr, knot_rcode_t *rcode) } return zones_query_check_zone(xfr->zone, &xfr->addr, &xfr->tsig_key, - rcode); + rcode, knot_packet_opcode(xfr->query)); } /*----------------------------------------------------------------------------*/ diff --git a/src/knot/server/zones.h b/src/knot/server/zones.h index 33b3d70..1ed724c 100755 --- a/src/knot/server/zones.h +++ b/src/knot/server/zones.h @@ -139,7 +139,8 @@ int zones_zonefile_sync(knot_zone_t *zone, journal_t *journal); * \todo Document me. */ int zones_query_check_zone(const knot_zone_t *zone, const sockaddr_t *addr, - knot_key_t **tsig_key, knot_rcode_t *rcode); + knot_key_t **tsig_key, knot_rcode_t *rcode, + uint8_t q_opcode); /*! * \todo Document me. diff --git a/src/knotc.8 b/src/knotc.8 index 9776ff7..3f87c3e 100755 --- a/src/knotc.8 +++ b/src/knotc.8 @@ -1,4 +1,4 @@ -.TH knotc "8" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.2-rc1" +.TH knotc "8" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.2" .SH NAME .B knotc \- Knot DNS control utility diff --git a/src/knotd.8 b/src/knotd.8 index 63eba6e..8504777 100755 --- a/src/knotd.8 +++ b/src/knotd.8 @@ -1,4 +1,4 @@ -.TH "knotd" "8" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.2-rc1" +.TH "knotd" "8" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.2" .SH NAME .B knotd \- Knot DNS daemon |