Merge branch 'development' into tsig

src/knot/main.c

@@ -159,7 +159,8 @@ int main(int argc, char **argv)
 
 		log_server_error("Failed to parse configuration file '%s'.\n",
 				 config_fn);
-
+		server_destroy(&server);
+		free(config_fn);
 		return 1;
 	} else {
 		log_server_info("Configured %d interfaces and %d zones.\n",

src/knot/server/xfr-handler.c

@@ -810,6 +810,17 @@ static int xfr_process_request(xfrworker_t *w, uint8_t *buf, size_t buflen)
 		
 		ret = zones_xfr_load_changesets(&xfr);
 		if (ret != KNOTD_EOK) {
+			/* History cannot be reconstructed, fallback to AXFR. */
+			if (ret == KNOTD_ERANGE) {
+				log_server_info("IXFR transfer of zone '%s/OUT'"
+						" - not enough data in journal,"
+						" fallback to AXFR.\n",
+						zname,
+						r_addr, r_port);
+				xfr.type = XFR_TYPE_AOUT;
+				xfr_request(w->master, &xfr);
+				return KNOTD_EOK;
+			}
 			knot_ns_xfr_send_error(&xfr, KNOT_RCODE_SERVFAIL);
 			socket_close(xfr.session);
 		}

src/knot/server/zones.c

@@ -1105,7 +1105,7 @@ static int zones_insert_zones(knot_nameserver_t *ns,
 					ret = knot_zonedb_add_zone(db_new, sz);
 					if (ret != KNOT_EOK) {
 						dbg_zones("zones: failed to add "
-						          "stub zone '%'s.\n",
+						          "stub zone '%s'.\n",
 						          z->name);
 						knot_zone_deep_free(&sz, 0);
 						sz = 0;
@@ -1120,7 +1120,7 @@ static int zones_insert_zones(knot_nameserver_t *ns,
 
 				} else {
 					dbg_zones("zones: failed to create "
-					          "stub zone '%'s.\n",
+					          "stub zone '%s'.\n",
 					          z->name);
 					ret = KNOT_ERROR;
 				}
@@ -1152,7 +1152,7 @@ static int zones_insert_zones(knot_nameserver_t *ns,
 				
 				dbg_zones_verb("zones: inserted '%s' into "
 				               "database, initializing data\n",
-				               z->name)
+				               z->name);
 
 				/* Initialize zone-related data. */
 				zonedata_init(z, zone);