diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-07-14 22:42:33 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-07-14 22:42:33 +0000 |
| commit | c961106dc72a63290be93976745cd2764d87e1b5 (patch) | |
| tree | 97ff1b3ba4d89bca4d756bd522e97a967f082b46 /src/lib/gssapi | |
| parent | a68afdd3636a7b158d559f5f3e07763b180f7ce5 (diff) | |
| download | krb5-c961106dc72a63290be93976745cd2764d87e1b5.tar.gz krb5-c961106dc72a63290be93976745cd2764d87e1b5.tar.xz krb5-c961106dc72a63290be93976745cd2764d87e1b5.zip | |
* gss_libinit.c: Conditionalized error table loading for Mac OS X.
Error tables should always be loaded on other platforms.
* gss_libinit.c: updated for Mac OS X header paths and added
include of gssapiP_krb5.h to get function prototypes.
[pullups from 1-2-2-branch]
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14647 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi')
| -rw-r--r-- | src/lib/gssapi/ChangeLog | 10 | ||||
| -rw-r--r-- | src/lib/gssapi/gss_libinit.c | 7 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog index eed5015a2d..3dcb4207b8 100644 --- a/src/lib/gssapi/ChangeLog +++ b/src/lib/gssapi/ChangeLog @@ -1,3 +1,13 @@ +2002-07-14 Alexandra Ellwood <lxs@mit.edu> + + * gss_libinit.c: Conditionalized error table loading for Mac OS X. + Error tables should always be loaded on other platforms. + + * gss_libinit.c: updated for Mac OS X header paths and added + include of gssapiP_krb5.h to get function prototypes. + + [pullups from 1-2-2-branch] + 2001-09-01 Ken Raeburn <raeburn@mit.edu> * Makefile.in (SRCS): Use $(srcdir) not $(subdir). diff --git a/src/lib/gssapi/gss_libinit.c b/src/lib/gssapi/gss_libinit.c index 53401c5365..88e89bbe4e 100644 --- a/src/lib/gssapi/gss_libinit.c +++ b/src/lib/gssapi/gss_libinit.c @@ -1,5 +1,10 @@ #include <assert.h> +#if TARGET_OS_MAC +/* Mac OS X com_err files do not include com_err for you */ +#include <Kerberos/com_err.h> +#endif + #include "gssapi_err_generic.h" #include "gssapi_err_krb5.h" #include "gssapiP_krb5.h" @@ -16,8 +21,10 @@ OM_uint32 gssint_initialize_library (void) { if (!initialized) { +#if !TARGET_OS_MAC || USE_HARDCODED_FALLBACK_ERROR_TABLES add_error_table(&et_k5g_error_table); add_error_table(&et_ggss_error_table); +#endif initialized = 1; } |