* 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

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 02462c1cc5189f12a89c4fa0f58a9e87edc4dada..9d9c54a8270736c08dd7b936622e00cba52978ca 100644 (file)
--- 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 c50dff187bfe805c527d3ec0c48160120c816738..27582b65fb3305dce3a7af66659eac8bfdcf40f4 100644 (file)
--- 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;
 }