From: Evan Hunt <each@isc.org>
Date: Wed, 25 Apr 2018 19:24:39 +0000 (-0700)
Subject: Merge branch '159-improve-handling-of-inline-signed-zones-with-missing-signing-keys... 
X-Git-Tag: v9.9.13rc1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acabf5a689b5fe2aa3c21cfb515eff2914c7e7c3;p=thirdparty%2Fbind9.git

Merge branch '159-improve-handling-of-inline-signed-zones-with-missing-signing-keys' into 'v9_9'

Improve handling of inline signed zones with missing signing keys

Closes #159

See merge request isc-projects/bind9!133
---

acabf5a689b5fe2aa3c21cfb515eff2914c7e7c3
diff --cc bin/named/bind9.ver3.xsl.h
index b90ae594ed5,b90ae594ed5..c16cdea2c38
--- a/bin/named/bind9.ver3.xsl.h
+++ b/bin/named/bind9.ver3.xsl.h
@@@ -5,7 -5,7 +5,7 @@@
  static char xslmsg[] =
  	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
  	"<!--\n"
--	" - Copyright (C) 2012-2014 Internet Systems Consortium, Inc. (\"ISC\")\n"
++	" - Copyright (C) Internet Systems Consortium, Inc. (\"ISC\")\n"
  	" -\n"
  	" - Permission to use, copy, modify, and/or distribute this software for any\n"
  	" - purpose with or without fee is hereby granted, provided that the above\n"
@@@ -66,7 -66,7 +66,7 @@@
  	" }\n"
  	" }\n"
  	"\n"
--	" // Server Incoming Query Types \n"
++	" // Server Incoming Query Types\n"
  	" graphs.push({\n"
  	" 'title' : \"Server Incoming Query Types\",\n"
  	" 'target': 'chart_incoming_qtypes',\n"
diff --cc bin/named/bind9.xsl.h
index 19a58ff17c7,19a58ff17c7..11ace1ba46b
--- a/bin/named/bind9.xsl.h
+++ b/bin/named/bind9.xsl.h
@@@ -5,7 -5,7 +5,7 @@@
  static char xslmsg[] =
  	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
  	"<!--\n"
--	" - Copyright (C) 2006-2009 Internet Systems Consortium, Inc. (\"ISC\")\n"
++	" - Copyright (C) Internet Systems Consortium, Inc. (\"ISC\")\n"
  	" -\n"
  	" - Permission to use, copy, modify, and/or distribute this software for any\n"
  	" - purpose with or without fee is hereby granted, provided that the above\n"