diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-07-05 21:07:45 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-07-05 21:07:45 +0000 |
| commit | 9a83a33a8eedce0ba2f3209cabfafbe9fe062bbe (patch) | |
| tree | a3d3e4f64da5897479ca1daf1b5089e7ddc50bc1 /src | |
| parent | fc414c933f6604e7699f4abce4012440de9a13a7 (diff) | |
| download | krb5-9a83a33a8eedce0ba2f3209cabfafbe9fe062bbe.tar.gz krb5-9a83a33a8eedce0ba2f3209cabfafbe9fe062bbe.tar.xz krb5-9a83a33a8eedce0ba2f3209cabfafbe9fe062bbe.zip | |
* krb5_libinit.c: Conditionalized error table loading for
Mac OS X. Error tables should always be loaded on other
platforms.
* 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
[pullups form 1-2-2-branch]
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14605 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/ChangeLog | 12 | ||||
| -rw-r--r-- | src/lib/krb5/krb5_libinit.c | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index 02462c1cc..9d9c54a82 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,15 @@ +2002-07-03 Alexandra Ellwood <lxs@mit.edu> + + * krb5_libinit.c: Conditionalized error table loading for + Mac OS X. Error tables should always be loaded on other + platforms. + + * 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 + + [pullups form 1-2-2-branch] + 2002-06-25 Alexandra Ellwood <lxs@mit.edu> * krb5_libinit.c: Added an include for com_err.h since diff --git a/src/lib/krb5/krb5_libinit.c b/src/lib/krb5/krb5_libinit.c index c50dff187..27582b65f 100644 --- a/src/lib/krb5/krb5_libinit.c +++ b/src/lib/krb5/krb5_libinit.c @@ -21,10 +21,12 @@ krb5_error_code krb5int_initialize_library (void) { if (!initialized) { +#if !TARGET_OS_MAC || USE_HARDCODED_FALLBACK_ERROR_TABLES add_error_table(&et_krb5_error_table); add_error_table(&et_kv5m_error_table); add_error_table(&et_kdb5_error_table); add_error_table(&et_asn1_error_table); +#endif initialized = 1; } @@ -44,10 +46,12 @@ void krb5int_cleanup_library (void) krb5_stdcc_shutdown(); #endif +#if !TARGET_OS_MAC || USE_HARDCODED_FALLBACK_ERROR_TABLES remove_error_table(&et_krb5_error_table); remove_error_table(&et_kv5m_error_table); remove_error_table(&et_kdb5_error_table); remove_error_table(&et_asn1_error_table); +#endif initialized = 0; } |