pull up r22113 from trunk

 ------------------------------------------------------------------------
 r22113 | ghudson | 2009-03-24 13:24:31 -0400 (Tue, 24 Mar 2009) | 5 lines
 Changed paths:
    M /trunk/src/include/k5-int.h
    M /trunk/src/plugins/preauth/pkinit/pkinit.h
    M /trunk/src/plugins/preauth/pkinit/pkinit_clnt.c
    M /trunk/src/plugins/preauth/pkinit/pkinit_matching.c
    M /trunk/src/plugins/preauth/pkinit/pkinit_srv.c

 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.

ticket: 6397

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22233 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 5ee39549eefaf1bd9308e5c1243f25284922dfad..935f49d48ae30218b2bfd00ac26e1243f54f4fab 100644 (file)
--- 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 e18962e59968e599cfafb6110bbaa931940f2b85..754bf5a21abefd97c9b13f2f595c69fd7dded606 100644 (file)
--- 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 7e368959214e9a786f5458a6ee96d064d07b8b73..13651c57aa73a5d9f592ce4bb23b2f94612f38ab 100644 (file)
--- 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 aa59a7f4ed7e88143d764e375d4ed8d4580624fd..d089ab0ddf9700444be8d620c19ea24bd8f61877 100644 (file)
--- 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 ac39bdb5153a4d569e7bf7f9a9ccbdfdc0f40e6e..228815511d3aa1f32a15829c937c0443d3578557 100644 (file)
--- 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