From b92cf795431ca242c13a2aa28002848dc388ebad Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Thu, 10 Feb 2022 19:10:08 -0600
Subject: [PATCH] Revert "osx: Never load OS X CCAPI while testing"

This reverts commit 79d87af91060c5aa23678b283219467ddf6bb306.
---
 tests/can/krb5.conf.in             | 1 -
 tests/db/krb5-mit.conf.in          | 1 -
 tests/db/krb5.conf.in              | 1 -
 tests/gss/krb5.conf.in             | 1 -
 tests/gss/new_clients_k5.conf.in   | 1 -
 tests/kdc/krb5-authz.conf.in       | 1 -
 tests/kdc/krb5-authz2.conf.in      | 1 -
 tests/kdc/krb5-bx509.conf.in       | 1 -
 tests/kdc/krb5-canon.conf.in       | 1 -
 tests/kdc/krb5-canon2.conf.in      | 1 -
 tests/kdc/krb5-cccol.conf.in       | 1 -
 tests/kdc/krb5-hdb-mitdb.conf.in   | 1 -
 tests/kdc/krb5-httpkadmind.conf.in | 1 -
 tests/kdc/krb5-kcm.conf.in         | 1 -
 tests/kdc/krb5-pkinit.conf.in      | 1 -
 tests/kdc/krb5.conf.in             | 1 -
 tests/ldap/krb5.conf.in            | 1 -
 tests/plugin/krb5.conf.in          | 2 +-
 18 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/tests/can/krb5.conf.in b/tests/can/krb5.conf.in
index cb857a95c..275f95667 100644
--- 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
diff --git a/tests/db/krb5-mit.conf.in b/tests/db/krb5-mit.conf.in
index b91e58060..99ffe4a65 100644
--- 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 = {
diff --git a/tests/db/krb5.conf.in b/tests/db/krb5.conf.in
index 8d859bb0a..f5324cb5a 100644
--- 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 = {
diff --git a/tests/gss/krb5.conf.in b/tests/gss/krb5.conf.in
index becbe21c0..aae031db6 100644
--- 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 = {
diff --git a/tests/gss/new_clients_k5.conf.in b/tests/gss/new_clients_k5.conf.in
index b7250ff40..41c9e21d5 100644
--- 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
diff --git a/tests/kdc/krb5-authz.conf.in b/tests/kdc/krb5-authz.conf.in
index 5c155201b..0d4f38b74 100644
--- 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]
 
diff --git a/tests/kdc/krb5-authz2.conf.in b/tests/kdc/krb5-authz2.conf.in
index 81ea34e11..9a8efb0c7 100644
--- 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]
 
diff --git a/tests/kdc/krb5-bx509.conf.in b/tests/kdc/krb5-bx509.conf.in
index fb1976d07..8a9d0bb49 100644
--- 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
diff --git a/tests/kdc/krb5-canon.conf.in b/tests/kdc/krb5-canon.conf.in
index 06bfb3773..0ce45b58c 100644
--- 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
diff --git a/tests/kdc/krb5-canon2.conf.in b/tests/kdc/krb5-canon2.conf.in
index 19c15ca58..dae71d3e5 100644
--- 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
diff --git a/tests/kdc/krb5-cccol.conf.in b/tests/kdc/krb5-cccol.conf.in
index 8429bb90c..819de8007 100644
--- 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]
diff --git a/tests/kdc/krb5-hdb-mitdb.conf.in b/tests/kdc/krb5-hdb-mitdb.conf.in
index ca6ab6dd4..2be7eed4e 100644
--- 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
diff --git a/tests/kdc/krb5-httpkadmind.conf.in b/tests/kdc/krb5-httpkadmind.conf.in
index 598ed98bb..4882d52f5 100644
--- 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
diff --git a/tests/kdc/krb5-kcm.conf.in b/tests/kdc/krb5-kcm.conf.in
index af47b5861..bdcca073c 100644
--- 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]
diff --git a/tests/kdc/krb5-pkinit.conf.in b/tests/kdc/krb5-pkinit.conf.in
index e1fc9fcf7..fbc21277a 100644
--- 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
diff --git a/tests/kdc/krb5.conf.in b/tests/kdc/krb5.conf.in
index d24f7799d..a85836d76 100644
--- 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]
diff --git a/tests/ldap/krb5.conf.in b/tests/ldap/krb5.conf.in
index 5ddfc45b4..e5f1a1791 100644
--- 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 = {
diff --git a/tests/plugin/krb5.conf.in b/tests/plugin/krb5.conf.in
index 44ef0e8a8..d188c314b 100644
--- 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