Commit 5f122b65 authored by Tinderbox User's avatar Tinderbox User
Browse files

Merge branch 'master' of /proj/git/prod/bind9

parents f6f53ae2 fc9c44a8
...@@ -231,8 +231,8 @@ ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, ...@@ -231,8 +231,8 @@ ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
if (mgr->route != NULL) if (mgr->route != NULL)
isc_socket_detach(&mgr->route); isc_socket_detach(&mgr->route);
cleanup_aclenv: cleanup_aclenv:
#endif
dns_aclenv_destroy(&mgr->aclenv); dns_aclenv_destroy(&mgr->aclenv);
#endif
cleanup_listenon: cleanup_listenon:
ns_listenlist_detach(&mgr->listenon4); ns_listenlist_detach(&mgr->listenon4);
ns_listenlist_detach(&mgr->listenon6); ns_listenlist_detach(&mgr->listenon6);
......
...@@ -3308,7 +3308,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, ...@@ -3308,7 +3308,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
/* /*
* Ignore case when compressing responses to the specified * Ignore case when compressing responses to the specified
* clients. This causes case not always to be presrerved, * clients. This causes case not always to be preserved,
* and is needed by some broken clients. * and is needed by some broken clients.
*/ */
CHECK(configure_view_acl(vconfig, config, "no-case-compress", NULL, CHECK(configure_view_acl(vconfig, config, "no-case-compress", NULL,
......
...@@ -25,5 +25,5 @@ then ...@@ -25,5 +25,5 @@ then
else else
echo "I:This test requires cryptography" >&2 echo "I:This test requires cryptography" >&2
echo "I:configure with --with-openssl, or --with-pkcs11 and --enable-native-pkcs11" >&2 echo "I:configure with --with-openssl, or --with-pkcs11 and --enable-native-pkcs11" >&2
exit 1 exit 255
fi fi
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment