diff options
| author | Greg Hudson <ghudson@mit.edu> | 2009-03-24 17:24:31 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2009-03-24 17:24:31 +0000 |
| commit | f5b7e7bd5a5bfa1eed652ef75cb42118c523a8a4 (patch) | |
| tree | e57cad190398fd9685cd8484f6c08ad847aad602 /src/plugins/preauth | |
| parent | 602bc234c7836e33fb0feef608cea79c2d82ea8b (diff) | |
| download | krb5-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/plugins/preauth')
| -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 |
4 files changed, 20 insertions, 3 deletions
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 |