summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2009-03-24 17:24:31 +0000
committerGreg Hudson <ghudson@mit.edu>2009-03-24 17:24:31 +0000
commitf5b7e7bd5a5bfa1eed652ef75cb42118c523a8a4 (patch)
treee57cad190398fd9685cd8484f6c08ad847aad602 /src/include
parent602bc234c7836e33fb0feef608cea79c2d82ea8b (diff)
downloadkrb5-f5b7e7bd5a5bfa1eed652ef75cb42118c523a8a4.tar.gz
krb5-f5b7e7bd5a5bfa1eed652ef75cb42118c523a8a4.tar.xz
krb5-f5b7e7bd5a5bfa1eed652ef75cb42118c523a8a4.zip
Revert r21880 which included k5-int.h in several pkinit source files.
Instead, move the pkinit-specific KRB5_CONF macros to pkinit.h, and add duplicate definitions of the non-pkinit-specific macros used by the pkinit code. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22113 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
-rw-r--r--src/include/k5-int.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index c8c7d4d28..33ccb1690 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -241,22 +241,6 @@ typedef INT64_TYPE krb5_int64;
#define KRB5_CONF_MAX_RENEWABLE_LIFE "max_renewable_life"
#define KRB5_CONF_NOADDRESSES "noaddresses"
#define KRB5_CONF_PERMITTED_ENCTYPES "permitted_enctypes"
-#define KRB5_CONF_PKINIT_ALLOW_UPN "pkinit_allow_upn"
-#define KRB5_CONF_PKINIT_ANCHORS "pkinit_anchors"
-#define KRB5_CONF_PKINIT_CERT_MATCH "pkinit_cert_match"
-#define KRB5_CONF_PKINIT_DH_MIN_BITS "pkinit_dh_min_bits"
-#define KRB5_CONF_PKINIT_EKU_CHECKING "pkinit_eku_checking"
-#define KRB5_CONF_PKINIT_IDENTITY "pkinit_identity"
-#define KRB5_CONF_PKINIT_IDENTITIES "pkinit_identities"
-#define KRB5_CONF_PKINIT_KDC_HOSTNAME "pkinit_kdc_hostname"
-#define KRB5_CONF_PKINIT_KDC_OCSP "pkinit_kdc_ocsp"
-#define KRB5_CONF_PKINIT_LONGHORN "pkinit_longhorn"
-#define KRB5_CONF_PKINIT_MAPPING_FILE "pkinit_mappings_file"
-#define KRB5_CONF_PKINIT_POOL "pkinit_pool"
-#define KRB5_CONF_PKINIT_REVOKE "pkinit_revoke"
-#define KRB5_CONF_PKINIT_REQUIRE_CRL_CHECKING "pkinit_require_crl_checking"
-#define KRB5_CONF_PKINIT_WIN2K "pkinit_win2k"
-#define KRB5_CONF_PKINIT_WIN2K_REQUIRE_BINDING "pkinit_win2k_require_binding"
#define KRB5_CONF_PREFERRED_PREAUTH_TYPES "preferred_preauth_types"
#define KRB5_CONF_PROXIABLE "proxiable"
#define KRB5_CONF_RDNS "rdns"