pull up r22113 from trunk

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