svn rev #22233: branches/krb5-1-7/src/ include/ plugins/preauth/pkinit/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22233
Commit By: tlyu
Log Message:
ticket: 6397

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.


Changed Files:
U   branches/krb5-1-7/src/include/k5-int.h
U   branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit.h
U   branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit_clnt.c
U   branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit_matching.c
U   branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit_srv.c
Modified: branches/krb5-1-7/src/include/k5-int.h
===================================================================
--- branches/krb5-1-7/src/include/k5-int.h	2009-04-15 20:06:35 UTC (rev 22232)
+++ branches/krb5-1-7/src/include/k5-int.h	2009-04-15 20:06:38 UTC (rev 22233)
@@ -241,22 +241,6 @@
 #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"

Modified: branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit.h
===================================================================
--- branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit.h	2009-04-15 20:06:35 UTC (rev 22232)
+++ branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit.h	2009-04-15 20:06:38 UTC (rev 22233)
@@ -71,6 +71,26 @@
 
 #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

Modified: branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit_clnt.c
===================================================================
--- branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit_clnt.c	2009-04-15 20:06:35 UTC (rev 22232)
+++ branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit_clnt.c	2009-04-15 20:06:38 UTC (rev 22233)
@@ -38,7 +38,6 @@
 #include <dlfcn.h>
 #include <sys/stat.h>
 
-#include "k5-int.h"
 #include "pkinit.h"
 
 #ifdef LONGHORN_BETA_COMPAT

Modified: branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit_matching.c
===================================================================
--- branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit_matching.c	2009-04-15 20:06:35 UTC (rev 22232)
+++ branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit_matching.c	2009-04-15 20:06:38 UTC (rev 22233)
@@ -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;

Modified: branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit_srv.c
===================================================================
--- branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit_srv.c	2009-04-15 20:06:35 UTC (rev 22232)
+++ branches/krb5-1-7/src/plugins/preauth/pkinit/pkinit_srv.c	2009-04-15 20:06:38 UTC (rev 22233)
@@ -33,7 +33,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "k5-int.h"
 #include "pkinit.h"
 
 static krb5_error_code