Merge tag 'upstream/1.2.0' into debian-sid

Upstream version 1.2.0

9 files changed, 28 insertions, 20 deletions

diff --git a/RELNOTES b/RELNOTES
index af80626..a5b04ce 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,9 @@
+v1.2.0 - Mar 29, 2013
+---------------------
+
+Bugfixes:
+	* Memory leaks
+
 v1.2.0-rc4 - Mar 22, 2013
 -------------------------
 
@@ -5,6 +11,7 @@ Features:
 	* knotc 'zonestatus' command
 
 Bugfixes:
+	* Check for broken recvmmsg() implementation
 	* Changing logfile ownership before dropping privileges
 	* knotc respects 'control' section from configuration
 	* RRL: resolved bucket collisions
diff --git a/configure b/configure
index c70bff3..1e25f68 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for knot 1.2.0-rc4.
+# Generated by GNU Autoconf 2.69 for knot 1.2.0.
 #
 # Report bugs to <knot-dns@labs.nic.cz>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='knot'
 PACKAGE_TARNAME='knot'
-PACKAGE_VERSION='1.2.0-rc4'
-PACKAGE_STRING='knot 1.2.0-rc4'
+PACKAGE_VERSION='1.2.0'
+PACKAGE_STRING='knot 1.2.0'
 PACKAGE_BUGREPORT='knot-dns@labs.nic.cz'
 PACKAGE_URL=''
 
@@ -1319,7 +1319,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.2.0-rc4 to adapt to many kinds of systems.
+\`configure' configures knot 1.2.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1389,7 +1389,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of knot 1.2.0-rc4:";;
+     short | recursive ) echo "Configuration of knot 1.2.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1509,7 +1509,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-knot configure 1.2.0-rc4
+knot configure 1.2.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2062,7 +2062,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.2.0-rc4, which was
+It was created by knot $as_me 1.2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2889,7 +2889,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='knot'
- VERSION='1.2.0-rc4'
+ VERSION='1.2.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15469,7 +15469,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.2.0-rc4, which was
+This file was extended by knot $as_me 1.2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15535,7 +15535,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.2.0-rc4
+knot config.status 1.2.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 23ff7c0..ee1d73c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 
 AC_PREREQ([2.60])
-AC_INIT([knot], [1.2.0-rc4], [knot-dns@labs.nic.cz])
+AC_INIT([knot], [1.2.0], [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/samples/knot.full.conf b/samples/knot.full.conf
index 8c02d3c..705c965 100644
--- a/samples/knot.full.conf
+++ b/samples/knot.full.conf
@@ -18,7 +18,7 @@ system {
   identity "I have no mouth and must scream";
 
   # Version of the server (see RFC 4892). Not used yet.
-  version "1.2;
+  version "1.2";
 
   # Server identifier 
   # Use string format "text"
diff --git a/src/knot.conf.5 b/src/knot.conf.5
index ccd2960..361bbb1 100644
--- a/src/knot.conf.5
+++ b/src/knot.conf.5
@@ -1,4 +1,4 @@
-.TH "knot.conf" "5" "September 2012" "CZ.NIC Labs" "Knot DNS, version 1.2.0-rc4"
+.TH "knot.conf" "5" "March 2013" "CZ.NIC Labs" "Knot DNS, version 1.2.0"
 .SH "NAME"
 .LP
 .B knot.conf
diff --git a/src/knot/conf/conf.c b/src/knot/conf/conf.c
index 28d33e0..562fb89 100644
--- a/src/knot/conf/conf.c
+++ b/src/knot/conf/conf.c
@@ -507,6 +507,7 @@ conf_t *conf_new(const char* path)
 	c->ixfr_fslimit = -1;
 	c->uid = -1;
 	c->gid = -1;
+	c->rrl_slip = -1;
 	c->build_diffs = 0; /* Disable by default. */
 	
 	/* ACLs. */
diff --git a/src/knot/ctl/knotc_main.c b/src/knot/ctl/knotc_main.c
index 3354cae..dd37ddf 100644
--- a/src/knot/ctl/knotc_main.c
+++ b/src/knot/ctl/knotc_main.c
@@ -730,6 +730,11 @@ int main(int argc, char **argv)
 				memcpy(ctl_if->key, &r_key, sizeof(knot_key_t));
 			}
 		}
+	} else {
+		if (r_key.name) {
+			tsig_key_cleanup(ctl_if->key);
+			ctl_if->key = &r_key;
+		}
 	}
 	
 	/* Override from command line. */
@@ -742,11 +747,6 @@ int main(int argc, char **argv)
 		}
 	}
 	if (r_port > -1) ctl_if->port = r_port;
-	if (r_key.name != NULL) {
-		tsig_key_cleanup(ctl_if->key);
-		ctl_if->key = &r_key;
-	}
-	
 
 	/* Verbose mode. */
 	if (has_flag(flags, F_VERBOSE)) {
diff --git a/src/knotc.8 b/src/knotc.8
index bf4561f..b043ebe 100644
--- a/src/knotc.8
+++ b/src/knotc.8
@@ -1,4 +1,4 @@
-.TH knotc "8" "September 2012" "CZ.NIC Labs" "Knot DNS, version 1.2.0-rc4"
+.TH knotc "8" "March 2013" "CZ.NIC Labs" "Knot DNS, version 1.2.0"
 .SH NAME
 .B knotc
 \- Knot DNS control utility
diff --git a/src/knotd.8 b/src/knotd.8
index 3681343..426668c 100644
--- a/src/knotd.8
+++ b/src/knotd.8
@@ -1,4 +1,4 @@
-.TH "knotd" "8" "September 2012" "CZ.NIC Labs" "Knot DNS, version 1.2.0-rc4"
+.TH "knotd" "8" "March 2013" "CZ.NIC Labs" "Knot DNS, version 1.2.0"
 .SH NAME
 .B knotd
 \- Knot DNS daemon