diff options
author | Jeffrey Altman <jaltman@secure-endpoints.com> | 2005-11-15 00:31:41 +0000 |
---|---|---|
committer | Jeffrey Altman <jaltman@secure-endpoints.com> | 2005-11-15 00:31:41 +0000 |
commit | a765e2551b7afdcc77eb8a798a73efd0eaebceae (patch) | |
tree | 16bc389997eeb8b6d8d3e3558362ae81616504e7 | |
parent | e9f59ca61ff224908576959a2cf394b63d05c462 (diff) | |
download | krb5-a765e2551b7afdcc77eb8a798a73efd0eaebceae.zip krb5-a765e2551b7afdcc77eb8a798a73efd0eaebceae.tar.gz krb5-a765e2551b7afdcc77eb8a798a73efd0eaebceae.tar.bz2 |
This commit ensures that all files in the library include
k5-int.h before krb5.h is included either directly or
indirectly. This is to allow Kerberos to use pre-processor
symbols to choose configurations of C run time library headers
without affecting third party applications.
ticket: 3236
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17489 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r-- | src/lib/gssapi/krb5/ChangeLog | 4 | ||||
-rw-r--r-- | src/lib/gssapi/krb5/gssapiP_krb5.h | 2 | ||||
-rw-r--r-- | src/lib/krb5/ChangeLog | 4 | ||||
-rw-r--r-- | src/lib/krb5/asn.1/ChangeLog | 4 | ||||
-rw-r--r-- | src/lib/krb5/asn.1/krb5_decode.c | 2 | ||||
-rw-r--r-- | src/lib/krb5/asn.1/krb5_encode.c | 2 | ||||
-rw-r--r-- | src/lib/krb5/ccache/ccapi/ChangeLog | 4 | ||||
-rw-r--r-- | src/lib/krb5/ccache/ccapi/stdcc.c | 2 | ||||
-rw-r--r-- | src/lib/krb5/ccache/ccapi/winccld.c | 2 | ||||
-rw-r--r-- | src/lib/krb5/krb5_libinit.c | 2 | ||||
-rw-r--r-- | src/lib/krb5/rcache/ChangeLog | 4 | ||||
-rw-r--r-- | src/lib/krb5/rcache/rc_io.c | 2 |
12 files changed, 27 insertions, 7 deletions
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index ec6b134..0e6c3a4 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Jeffrey Altman <jaltman@mit.edu> + + * gssapi_krb5.hin: include k5-int.h instead of krb5.h + 2005-10-20 Alexandra Ellwood <lxs@mit.edu>, Jeffrey Altman <jaltman@mit.edu> * acquire_cred.c (acquire_init_cred): diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h index cf78b94..7d7599c 100644 --- a/src/lib/gssapi/krb5/gssapiP_krb5.h +++ b/src/lib/gssapi/krb5/gssapiP_krb5.h @@ -47,7 +47,7 @@ #ifndef _GSSAPIP_KRB5_H_ #define _GSSAPIP_KRB5_H_ -#include <krb5.h> +#include <k5-int.h> #ifdef HAVE_MEMORY_H #include <memory.h> diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index c2bfd88..f7849ae 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Jeffrey Altman <jaltman@mit.edu> + + * krb5_libinit.c: include k5-int.h instead of krb5.h + 2005-08-20 Ken Raeburn <raeburn@mit.edu> * configure.in: Use K5_AC_INIT instead of AC_INIT. diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog index f7459c0..821b2a0 100644 --- a/src/lib/krb5/asn.1/ChangeLog +++ b/src/lib/krb5/asn.1/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Jeffrey Altman <jaltman@mit.edu> + + * krb5_decode.c, krb5_encode.c: include k5-int.h instead of krb5.h + 2005-10-03 Tom Yu <tlyu@mit.edu> * asn1_get.c (asn1_get_tag_2): Patch from Zhihong Zhang to properly diff --git a/src/lib/krb5/asn.1/krb5_decode.c b/src/lib/krb5/asn.1/krb5_decode.c index 7457c00..04097b0 100644 --- a/src/lib/krb5/asn.1/krb5_decode.c +++ b/src/lib/krb5/asn.1/krb5_decode.c @@ -24,7 +24,7 @@ * or implied warranty. */ -#include "krb5.h" +#include "k5-int.h" #include "krbasn1.h" #include "asn1_k_decode.h" #include "asn1_decode.h" diff --git a/src/lib/krb5/asn.1/krb5_encode.c b/src/lib/krb5/asn.1/krb5_encode.c index ecdfa18..639db43 100644 --- a/src/lib/krb5/asn.1/krb5_encode.c +++ b/src/lib/krb5/asn.1/krb5_encode.c @@ -24,7 +24,7 @@ * or implied warranty. */ -#include "krb5.h" +#include "k5-int.h" #include "asn1_k_encode.h" #include "asn1_encode.h" #include "krbasn1.h" diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog index 4c97777..005a043 100644 --- a/src/lib/krb5/ccache/ccapi/ChangeLog +++ b/src/lib/krb5/ccache/ccapi/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Jeffrey Altman <jaltman@mit.edu> + + * winccld.c, stdcc.c: include k5-int.h before stdcc.h + 2004-11-15 Ken Raeburn <raeburn@mit.edu> * stdcc.c (krb5_stdcc_get_flags): New function. diff --git a/src/lib/krb5/ccache/ccapi/stdcc.c b/src/lib/krb5/ccache/ccapi/stdcc.c index 7e6ffe7..885abf5 100644 --- a/src/lib/krb5/ccache/ccapi/stdcc.c +++ b/src/lib/krb5/ccache/ccapi/stdcc.c @@ -29,10 +29,10 @@ */ #define NEED_WINDOWS +#include "k5-int.h" #include "stdcc.h" #include "stdcc_util.h" #include "string.h" -#include "k5-int.h" #include <stdio.h> apiCB *gCntrlBlock = NULL; diff --git a/src/lib/krb5/ccache/ccapi/winccld.c b/src/lib/krb5/ccache/ccapi/winccld.c index 71c2c94..ac3a8e4 100644 --- a/src/lib/krb5/ccache/ccapi/winccld.c +++ b/src/lib/krb5/ccache/ccapi/winccld.c @@ -6,8 +6,8 @@ #include <windows.h> #include <stdio.h> -#include "stdcc.h" #include "k5-int.h" +#include "stdcc.h" /* from fcc-proto.h */ extern const krb5_cc_ops krb5_fcc_ops; diff --git a/src/lib/krb5/krb5_libinit.c b/src/lib/krb5/krb5_libinit.c index 8764e69..6771776 100644 --- a/src/lib/krb5/krb5_libinit.c +++ b/src/lib/krb5/krb5_libinit.c @@ -2,7 +2,7 @@ #include "autoconf.h" #include "com_err.h" -#include "krb5.h" +#include "k5-int.h" #include "krb5_err.h" #include "kv5m_err.h" #include "asn1_err.h" diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog index 79b1d37..1d0e823 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Jeffrey Altman <jaltman@mit.edu> + + * rc_io.c: include k5-int.h instead of krb5.h + 2005-04-13 Ken Raeburn <raeburn@mit.edu> * rc_io.c (NEED_SOCKETS, NEED_LOWLEVEL_IO): Don't define. diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c index 9897f73..52b57e4 100644 --- a/src/lib/krb5/rcache/rc_io.c +++ b/src/lib/krb5/rcache/rc_io.c @@ -19,7 +19,7 @@ #define KRB5_RC_VNO 0x0501 /* krb5, rcache v 1 */ -#include "krb5.h" +#include "k5-int.h" #include <stdio.h> /* for P_tmpdir */ #include "rc_base.h" #include "rc_dfl.h" |