diff options
| -rw-r--r-- | src/include/k5-int.h | 16 | ||||
| -rw-r--r-- | src/plugins/preauth/pkinit/pkinit.h | 20 | ||||
| -rw-r--r-- | src/plugins/preauth/pkinit/pkinit_clnt.c | 1 | ||||
| -rw-r--r-- | src/plugins/preauth/pkinit/pkinit_matching.c | 1 | ||||
| -rw-r--r-- | src/plugins/preauth/pkinit/pkinit_srv.c | 1 |
5 files changed, 20 insertions, 19 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" diff --git a/src/plugins/preauth/pkinit/pkinit.h b/src/plugins/preauth/pkinit/pkinit.h index e18962e59..754bf5a21 100644 --- a/src/plugins/preauth/pkinit/pkinit.h +++ b/src/plugins/preauth/pkinit/pkinit.h @@ -71,6 +71,26 @@ extern int longhorn; /* XXX Talking to a Longhorn server? */ #define PKINIT_DEFAULT_DH_MIN_BITS 2048 +#define KRB5_CONF_KDCDEFAULTS "kdcdefaults" +#define KRB5_CONF_LIBDEFAULTS "libdefaults" +#define KRB5_CONF_REALMS "realms" +#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_IDENTITIES "pkinit_identities" +#define KRB5_CONF_PKINIT_IDENTITY "pkinit_identity" +#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_mapping_file" +#define KRB5_CONF_PKINIT_POOL "pkinit_pool" +#define KRB5_CONF_PKINIT_REQUIRE_CRL_CHECKING "pkinit_require_crl_checking" +#define KRB5_CONF_PKINIT_REVOKE "pkinit_revoke" +#define KRB5_CONF_PKINIT_WIN2K "pkinit_win2k" +#define KRB5_CONF_PKINIT_WIN2K_REQUIRE_BINDING "pkinit_win2k_require_binding" + /* Make pkiDebug(fmt,...) print, or not. */ #ifdef DEBUG #define pkiDebug printf diff --git a/src/plugins/preauth/pkinit/pkinit_clnt.c b/src/plugins/preauth/pkinit/pkinit_clnt.c index 7e3689592..13651c57a 100644 --- a/src/plugins/preauth/pkinit/pkinit_clnt.c +++ b/src/plugins/preauth/pkinit/pkinit_clnt.c @@ -38,7 +38,6 @@ #include <dlfcn.h> #include <sys/stat.h> -#include "k5-int.h" #include "pkinit.h" #ifdef LONGHORN_BETA_COMPAT diff --git a/src/plugins/preauth/pkinit/pkinit_matching.c b/src/plugins/preauth/pkinit/pkinit_matching.c index aa59a7f4e..d089ab0dd 100644 --- a/src/plugins/preauth/pkinit/pkinit_matching.c +++ b/src/plugins/preauth/pkinit/pkinit_matching.c @@ -34,7 +34,6 @@ #include <stdlib.h> #include <unistd.h> #include <regex.h> -#include "k5-int.h" #include "pkinit.h" typedef struct _pkinit_cert_info pkinit_cert_info; diff --git a/src/plugins/preauth/pkinit/pkinit_srv.c b/src/plugins/preauth/pkinit/pkinit_srv.c index ac39bdb51..228815511 100644 --- a/src/plugins/preauth/pkinit/pkinit_srv.c +++ b/src/plugins/preauth/pkinit/pkinit_srv.c @@ -33,7 +33,6 @@ #include <errno.h> #include <string.h> -#include "k5-int.h" #include "pkinit.h" static krb5_error_code |