From: Mark Andrews <marka@isc.org>
Date: Mon, 31 Mar 2014 04:38:36 +0000 (+1100)
Subject: 3796.   [bug]           Register dns and pkcs#11 error codes. [RT #35629]
X-Git-Tag: v9.10.0rc1~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51e6164fd6b47121040f79b6330edf6258418a0b;p=thirdparty%2Fbind9.git

3796.   [bug]           Register dns and pkcs#11 error codes. [RT #35629]
---

diff --git a/CHANGES b/CHANGES
index 24a4b8587d1..f775e19dd87 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3796.	[bug]		Register dns and pkcs#11 error codes. [RT #35629]
+
 3795.	[bug]		Make named-checkconf detect raw masterfiles for
 			hint zones and reject them. [RT #35268]
 
diff --git a/bin/confgen/ddns-confgen.c b/bin/confgen/ddns-confgen.c
index 52a73b970f0..4e2b4a87403 100644
--- a/bin/confgen/ddns-confgen.c
+++ b/bin/confgen/ddns-confgen.c
@@ -106,6 +106,11 @@ main(int argc, char **argv) {
 	int len = 0;
 	int ch;
 
+#ifdef PKCS11CRYPTO
+	pk11_result_register();
+#endif
+	dns_result_register();
+
 	result = isc_file_progname(*argv, program, sizeof(program));
 	if (result != ISC_R_SUCCESS)
 		memmove(program, "tsig-keygen", 11);