Revert "osx: Never load OS X CCAPI while testing"

This reverts commit 79d87af910.
2022-02-10 19:10:08 -06:00
parent 88d0102c82
commit b92cf79543
18 changed files with 1 additions and 18 deletions
--- a/tests/can/krb5.conf.in
+++ b/tests/can/krb5.conf.in
@@ -3,7 +3,6 @@
 [libdefaults]
 	default_realm = TEST.H5L.SE
 	no-addresses = TRUE
-        ccapi_library = /no/such/file

 [appdefaults]
 	pkinit_anchors = FILE:@srcdir@/../../lib/hx509/data/ca.crt
--- a/tests/db/krb5-mit.conf.in
+++ b/tests/db/krb5-mit.conf.in
@@ -1,6 +1,5 @@
 [libdefaults]
 	default_realm = EXAMPLE.ORG
-        ccapi_library = /no/such/file

 [kdc]
 	database = {
--- a/tests/db/krb5.conf.in
+++ b/tests/db/krb5.conf.in
@@ -1,6 +1,5 @@
 [libdefaults]
 	default_realm = EXAMPLE.ORG
-        ccapi_library = /no/such/file

 [realms]
 	EXAMPLE.ORG = {
--- a/tests/gss/krb5.conf.in
+++ b/tests/gss/krb5.conf.in
@@ -8,7 +8,6 @@ include @srcdirabs@/include-krb5.conf
 	kuserok = SYSTEM-K5LOGIN:@srcdir@/../kdc/k5login
 	kuserok = USER-K5LOGIN
 	kuserok = SIMPLE
-        ccapi_library = /no/such/file

 [realms]
 	TEST.H5L.SE = {
--- a/tests/gss/new_clients_k5.conf.in
+++ b/tests/gss/new_clients_k5.conf.in
@@ -3,4 +3,3 @@ include @objdirabs@/krb5.conf
 [libdefaults]
 	client_aware_channel_bindings = true
 	report_canonical_client_name = true
-        ccapi_library = /no/such/file
--- a/tests/kdc/krb5-authz.conf.in
+++ b/tests/kdc/krb5-authz.conf.in
@@ -4,7 +4,6 @@
 	kuserok = SYSTEM-K5LOGIN:@srcdir@/k5login
 	kuserok = USER-K5LOGIN
 	kuserok = SIMPLE
-        ccapi_library = /no/such/file

 [appdefaults]

--- a/tests/kdc/krb5-authz2.conf.in
+++ b/tests/kdc/krb5-authz2.conf.in
@@ -5,7 +5,6 @@
 	k5login_directory = @srcdir@/k5login
 	kuserok = SYSTEM-K5LOGIN
 	kuserok = SIMPLE
-        ccapi_library = /no/such/file

 [appdefaults]

--- a/tests/kdc/krb5-bx509.conf.in
+++ b/tests/kdc/krb5-bx509.conf.in
@@ -5,7 +5,6 @@
        rdns = false
        fcache_strict_checking = false
        name_canon_rules = as-is:realm=TEST.H5L.SE
-        ccapi_library = /no/such/file

 [appdefaults]
 	pkinit_anchors = FILE:@objdir@/pkinit-anchor.pem
--- a/tests/kdc/krb5-canon.conf.in
+++ b/tests/kdc/krb5-canon.conf.in
@@ -9,7 +9,6 @@
 	name_canon_rules = qualify:domain=test1.h5l.se:realm=TEST2.H5L.SE
 	name_canon_rules = qualify:domain=test2.h5l.se:realm=TEST2.H5L.SE
 	name_canon_rules = qualify:domain=test3.h5l.se:realm=TEST3.H5L.SE
-        ccapi_library = /no/such/file

 [appdefaults]
 	pkinit_anchors = FILE:@srcdir@/../../lib/hx509/data/ca.crt
--- a/tests/kdc/krb5-canon2.conf.in
+++ b/tests/kdc/krb5-canon2.conf.in
@@ -6,7 +6,6 @@
 	name_canon_rules = as-is:realm=TEST2.H5L.SE
 	name_canon_rules = as-is:realm=TEST3.H5L.SE
 	name_canon_rules = nss
-        ccapi_library = /no/such/file

 [appdefaults]
 	pkinit_anchors = FILE:@srcdir@/../../lib/hx509/data/ca.crt
--- a/tests/kdc/krb5-cccol.conf.in
+++ b/tests/kdc/krb5-cccol.conf.in
@@ -5,7 +5,6 @@
 	allow_weak_crypto = @WEAK@
 	dns_lookup_kdc = no
 	dns_lookup_realm = no
-        ccapi_library = /no/such/file


 [appdefaults]
--- a/tests/kdc/krb5-hdb-mitdb.conf.in
+++ b/tests/kdc/krb5-hdb-mitdb.conf.in
@@ -2,7 +2,6 @@
 	default_realm = TEST.H5L.SE TEST2.H5L.SE
 	no-addresses = TRUE
 	allow_weak_crypto = TRUE
-        ccapi_library = /no/such/file

 [appdefaults]
 	pkinit_anchors = FILE:@srcdir@/../../lib/hx509/data/ca.crt
--- a/tests/kdc/krb5-httpkadmind.conf.in
+++ b/tests/kdc/krb5-httpkadmind.conf.in
@@ -5,7 +5,6 @@
        rdns = false
        fcache_strict_checking = false
        name_canon_rules = as-is:realm=TEST.H5L.SE
-        ccapi_library = /no/such/file

 [appdefaults]
 	pkinit_anchors = FILE:@objdir@/ca.crt
--- a/tests/kdc/krb5-kcm.conf.in
+++ b/tests/kdc/krb5-kcm.conf.in
@@ -5,7 +5,6 @@
 	allow_weak_crypto = @WEAK@
 	dns_lookup_kdc = no
 	dns_lookup_realm = no
-        ccapi_library = /no/such/file


 [appdefaults]
--- a/tests/kdc/krb5-pkinit.conf.in
+++ b/tests/kdc/krb5-pkinit.conf.in
@@ -3,7 +3,6 @@
 	no-addresses = TRUE
 	allow_weak_crypto = TRUE
        enable_kx509 = true
-        ccapi_library = /no/such/file

 [appdefaults]
 	pkinit_anchors = FILE:@objdir@/ca.crt
--- a/tests/kdc/krb5.conf.in
+++ b/tests/kdc/krb5.conf.in
@@ -4,7 +4,6 @@
 	allow_weak_crypto = @WEAK@
 	dns_lookup_kdc = no
 	dns_lookup_realm = no
-        ccapi_library = /no/such/file


 [appdefaults]
--- a/tests/ldap/krb5.conf.in
+++ b/tests/ldap/krb5.conf.in
@@ -4,7 +4,6 @@
 	default_realm = TEST.H5L.SE
 	no-addresses = TRUE
        plugin_dir = @objdir@/../../lib/hdb @objdir@/../../lib/hdb/.libs
-        ccapi_library = /no/such/file

 [realms]
 	TEST.H5L.SE = {
--- a/tests/plugin/krb5.conf.in
+++ b/tests/plugin/krb5.conf.in
@@ -3,8 +3,8 @@
 [libdefaults]
 	default_realm = TEST.H5L.SE
 	no-addresses = TRUE
+
 	plugin_dir = @objdir@ @objdir@/.libs
-        ccapi_library = /no/such/file

 [appdefaults]
 	pkinit_anchors = FILE:@srcdir@/../../lib/hx509/data/ca.crt