From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Tue, 11 Jul 2017 12:50:14 +0000 (+0200)
Subject: Merge branch 'master' into policy-reserved-domains
X-Git-Tag: v1.3.3~8^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2f929a7f171c4550985c760e3745fae6a8f817f;p=thirdparty%2Fknot-resolver.git

Merge branch 'master' into policy-reserved-domains

... to fix conflict in a generated lua file
---

a2f929a7f171c4550985c760e3745fae6a8f817f
diff --cc daemon/lua/kres-gen.lua
index 228f62859,0346fe99d..9d35ef8fc
--- a/daemon/lua/kres-gen.lua
+++ b/daemon/lua/kres-gen.lua
@@@ -162,12 -165,9 +165,12 @@@ struct kr_context 
  	struct kr_zonecut root_hints;
  	char _stub[];
  };
- struct query_flag {static const int NO_MINIMIZE = 1; static const int NO_THROTTLE = 2; static const int NO_IPV6 = 4; static const int NO_IPV4 = 8; static const int TCP = 16; static const int RESOLVED = 32; static const int AWAIT_IPV4 = 64; static const int AWAIT_IPV6 = 128; static const int AWAIT_CUT = 256; static const int SAFEMODE = 512; static const int CACHED = 1024; static const int NO_CACHE = 2048; static const int EXPIRING = 4096; static const int ALLOW_LOCAL = 8192; static const int DNSSEC_WANT = 16384; static const int DNSSEC_BOGUS = 32768; static const int DNSSEC_INSECURE = 65536; static const int STUB = 131072; static const int ALWAYS_CUT = 262144; static const int DNSSEC_WEXPAND = 524288; static const int PERMISSIVE = 1048576; static const int STRICT = 2097152; static const int BADCOOKIE_AGAIN = 4194304; static const int CNAME = 8388608; static const int REORDER_RR = 16777216; static const int TRACE = 33554432; static const int NO_0X20 = 67108864; static const int DNSSEC_NODS = 134217728; static const int DNSSEC_OPTOUT = 268435456; static const int NONAUTH = 536870912; static const int FORWARD = 1073741824;};
+ struct query_flag {static const int NO_MINIMIZE = 1; static const int NO_THROTTLE = 2; static const int NO_IPV6 = 4; static const int NO_IPV4 = 8; static const int TCP = 16; static const int RESOLVED = 32; static const int AWAIT_IPV4 = 64; static const int AWAIT_IPV6 = 128; static const int AWAIT_CUT = 256; static const int SAFEMODE = 512; static const int CACHED = 1024; static const int NO_CACHE = 2048; static const int EXPIRING = 4096; static const int ALLOW_LOCAL = 8192; static const int DNSSEC_WANT = 16384; static const int DNSSEC_BOGUS = 32768; static const int DNSSEC_INSECURE = 65536; static const int STUB = 131072; static const int ALWAYS_CUT = 262144; static const int DNSSEC_WEXPAND = 524288; static const int PERMISSIVE = 1048576; static const int STRICT = 2097152; static const int BADCOOKIE_AGAIN = 4194304; static const int CNAME = 8388608; static const int REORDER_RR = 16777216; static const int TRACE = 33554432; static const int NO_0X20 = 67108864; static const int DNSSEC_NODS = 134217728; static const int DNSSEC_OPTOUT = 268435456; static const int NONAUTH = 536870912; static const int FORWARD = 1073741824; static const int DNS64_MARK = 2147483648;};
 -int knot_dname_size(const knot_dname_t *);
  knot_dname_t *knot_dname_from_str(uint8_t *, const char *, size_t);
 +_Bool knot_dname_is_equal(const knot_dname_t *, const knot_dname_t *);
 +_Bool knot_dname_is_sub(const knot_dname_t *, const knot_dname_t *);
 +int knot_dname_labels(const uint8_t *, const uint8_t *);
 +int knot_dname_size(const knot_dname_t *);
  char *knot_dname_to_str(char *, const knot_dname_t *, size_t);
  uint16_t knot_rdata_rdlen(const knot_rdata_t *);
  uint8_t *knot_rdata_data(const knot_rdata_t *);