diff options
Diffstat (limited to 'src')
| -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 eed5015a2..3dcb4207b 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 53401c536..88e89bbe4 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; } |
