mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

[master] register pkcs11 error codes in dig

Browse Source 
3927.	[bug]		dig: report PKCS#11 error codes correctly when
			compiled with --enable-native-pkcs11. [RT #36956]
This commit is contained in:
Evan Hunt 2014-08-22 10:40:43 -07:00
parent a0707b6acf
commit 24aaa04401
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,3 +1,6 @@
3927. [bug] dig: report PKCS#11 error codes correctly when
compiled with --enable-native-pkcs11. [RT #36956]
3926. [doc] Added doc for geoip-directory. [RT #36877]
3925. [bug] DS lookup of RFC 1918 empty zones failed. [RT #36917]

2
bin/dig/Makefile.in
View File

@ -28,7 +28,7 @@ READLINE_LIB = @READLINE_LIB@
CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} ${BIND9_INCLUDES} \
${ISC_INCLUDES} ${LWRES_INCLUDES} ${ISCCFG_INCLUDES}
CDEFINES = -DVERSION=\"${VERSION}\"
CDEFINES = -DVERSION=\"${VERSION}\" @CRYPTO@
CWARNINGS =
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@

11
bin/dig/dighost.c
View File

@ -98,6 +98,10 @@
#include <dig/dig.h>
#ifdef PKCS11CRYPTO
#include <pk11/result.h>
#endif
#if ! defined(NS_INADDRSZ)
#define NS_INADDRSZ 4
#endif
@ -1434,6 +1438,11 @@ setup_libs(void) {
debug("setup_libs()");
#ifdef PKCS11CRYPTO
pk11_result_register();
#endif
dns_result_register();
result = isc_net_probeipv4();
if (result == ISC_R_SUCCESS)
have_ipv4 = ISC_TRUE;
@ -1492,8 +1501,6 @@ setup_libs(void) {
result = isc_mutex_init(&lookup_lock);
check_result(result, "isc_mutex_init");
dns_result_register();
}
#define EDNSOPTS 100U