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

bin/named/interfacemgr.c

@@ -231,8 +231,8 @@ ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
 	if (mgr->route != NULL)
 		isc_socket_detach(&mgr->route);
  cleanup_aclenv:
-#endif
 	dns_aclenv_destroy(&mgr->aclenv);
+#endif
  cleanup_listenon:
 	ns_listenlist_detach(&mgr->listenon4);
 	ns_listenlist_detach(&mgr->listenon6);

bin/named/server.c

@@ -3308,7 +3308,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
 
 	/*
 	 * 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.
 	 */
 	CHECK(configure_view_acl(vconfig, config, "no-case-compress", NULL,

bin/tests/system/rsabigexponent/prereq.sh

@@ -25,5 +25,5 @@ then
 else
     echo "I:This test requires cryptography" >&2
     echo "I:configure with --with-openssl, or --with-pkcs11 and --enable-native-pkcs11" >&2
-    exit 1
+    exit 255
 fi