diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-06-26 00:23:33 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-06-26 00:23:33 +0000 |
| commit | 5ec4ccb06ab2dc80ff0eb99e797c9f4d0cb66b1b (patch) | |
| tree | c7def9c6b08eb9d55aa01a25783ddd2e8696cfe0 /src | |
| parent | cc80e0005fb455749a40affb911ff002c5be4efc (diff) | |
| download | krb5-5ec4ccb06ab2dc80ff0eb99e797c9f4d0cb66b1b.tar.gz krb5-5ec4ccb06ab2dc80ff0eb99e797c9f4d0cb66b1b.tar.xz krb5-5ec4ccb06ab2dc80ff0eb99e797c9f4d0cb66b1b.zip | |
* krb5_libinit.c: Added an include for com_err.h since
it is not included by error table headers on Mac OS X. Also
fixed busted check for Mac OS
* krb5_libinit.c: added #define for Mac OS X so
that krb5int_cleanup_library calls krb5_stdcc_shutdown.
[pullups from 1-2-2-branch]
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14584 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/ChangeLog | 11 | ||||
| -rw-r--r-- | src/lib/krb5/krb5_libinit.c | 6 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index e9526be936..02462c1cc5 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,14 @@ +2002-06-25 Alexandra Ellwood <lxs@mit.edu> + + * krb5_libinit.c: Added an include for com_err.h since + it is not included by error table headers on Mac OS X. Also + fixed busted check for Mac OS + + * krb5_libinit.c: added #define for Mac OS X so + that krb5int_cleanup_library calls krb5_stdcc_shutdown. + + [pullups from 1-2-2-branch] + 2002-06-09 Ken Raeburn <raeburn@mit.edu> * configure.in: Don't set up keytab/file or keytab/srvtab diff --git a/src/lib/krb5/krb5_libinit.c b/src/lib/krb5/krb5_libinit.c index f303046cf6..c50dff187b 100644 --- a/src/lib/krb5/krb5_libinit.c +++ b/src/lib/krb5/krb5_libinit.c @@ -1,5 +1,9 @@ #include <assert.h> +#if TARGET_OS_MAC + #include <Kerberos/com_err.h> +#endif + #include "krb5.h" #include "krb5_err.h" #include "kv5m_err.h" @@ -36,7 +40,7 @@ void krb5int_cleanup_library (void) { assert (initialized); -#if defined(_WIN32) || defined(macintosh) +#if defined(_WIN32) || TARGET_OS_MAC krb5_stdcc_shutdown(); #endif |