From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 26 Apr 2017 10:53:41 +0000 (+0200)
Subject: NEWS: entry about ad-refactor merge
X-Git-Tag: v1.3.0~22^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8141d5c9ca886ceea68388503700391cf7d20bcb;p=thirdparty%2Fknot-resolver.git

NEWS: entry about ad-refactor merge

I'd like to add NEWS entries already in the merge requests,
but I often forget.
Also mark version with -dev.
---

diff --git a/NEWS b/NEWS
index 8256d2559..a18347364 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Knot Resolver 1.3.0 ? (2017-05-??)
+================================
+
+Security
+--------
+- Refactor handling of AD flag and security status of resource records.
+  In some cases it was possible for secure domains to get cached as
+  insecure, even for a TLD, leading to disabled validation.
+  It also fixes answering with non-authoritative data about nameservers.
+
+
 Knot Resolver 1.2.6 (2017-04-24)
 ================================
 
diff --git a/config.mk b/config.mk
index 9418a07f4..9ba66f9b4 100644
--- a/config.mk
+++ b/config.mk
@@ -2,7 +2,7 @@
 MAJOR := 1
 MINOR := 2
 PATCH := 6
-EXTRA :=
+EXTRA := -dev
 ABIVER := 3
 BUILDMODE := dynamic
 HARDENING := yes