Merge remote-tracking branch 'origin/development' into zc-merge

configure.ac

 #                                               -*- Autoconf -*-
 
 AC_PREREQ([2.65])
-AC_INIT([knot], [1.0.4rc1], [knot-dns@labs.nic.cz])
+AC_INIT([knot], [1.0.4rc2], [knot-dns@labs.nic.cz])
 AM_INIT_AUTOMAKE([gnu -Wall -Werror])
 AC_CONFIG_SRCDIR([src/knot/main.c])
 AC_CONFIG_HEADERS([src/config.h])

src/knot/main.c

@@ -168,8 +168,8 @@ int main(int argc, char **argv)
 		// Get absolute path to cwd
 		char *rpath = realpath(config_fn, NULL);
 		if (rpath == NULL) {
-			log_server_error("Couldn't get current working directory - "
-			                 "%s.\n", strerror(errno));
+			log_server_error("Couldn't get absolute path for configuration file '%s' - "
+			                 "%s.\n", config_fn, strerror(errno));
 			return 1;
 		} else {
 			free(config_fn);

src/knot/server/journal.h

@@ -129,7 +129,7 @@ typedef int (*journal_apply_t)(journal_t *j, journal_node_t *n);
 #define JOURNAL_NCOUNT 1024 /*!< Default node count. */
 /* HEADER = magic, crc, max_entries, qhead, qtail */
 #define JOURNAL_HSIZE (MAGIC_LENGTH + sizeof(crc_t) + sizeof(uint16_t) * 3) 
-#define JOURNAL_MAGIC {'k', 'n', 'o', 't', '1', '0', '2'}
+#define JOURNAL_MAGIC {'k', 'n', 'o', 't', '1', '0', '4'}
 
 /*!
  * \brief Create new journal.

src/knot/zone/zone-dump.h

@@ -38,7 +38,7 @@ enum {
 };
 
 /*! \brief Magic identifier: { "knot", maj_ver, min_ver, revision } */
-#define MAGIC_BYTES {'k', 'n', 'o', 't', '1', '0', '3'}
+#define MAGIC_BYTES {'k', 'n', 'o', 't', '1', '0', '4'}
 
 /*!
  * \brief Dumps given zone to binary file.

src/zcompile/zparser.y

@@ -566,14 +566,19 @@ str_seq:	STR
     {
 	    zadd_rdata_txt_wireformat(zparser_conv_text($1.str, $1.len), 1);
 
-	    free($1.str);
+	    if(strcmp($1.str, ".") && strcmp($1.str, "@")
+                && strcmp($1.str, "\\#")) {		// Lexer freed that
+	    	free($1.str);
+            }
     }
     |	str_seq sp STR
     {
 	    zadd_rdata_txt_wireformat(zparser_conv_text($3.str, $3.len), 0);
-//	zc_warning("multiple TXT entries are currently not supported!");
 
-	    free($3.str);
+	    if(strcmp($3.str, ".") && strcmp($3.str, "@")
+                && strcmp($3.str, "\\#")) {		// Lexer freed that
+	    	free($3.str);
+            }
     }
     ;