* gss_libinit.c: Removed Mac header goober. Fixed USE_HARDCODED_FALLBACK_ERROR_TABLES...

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15251 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 04541f15d61c3959c76c664209108531791ad24d..27dba4b5493a322a8094ffedda25cf575fb6562b 100644 (file)
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-06  Alexandra Ellwood  <lxs@mit.edu>
+
+    * gss_libinit.c: Removed Mac header goober.
+    Fixed USE_HARDCODED_FALLBACK_ERROR_TABLES macro used by KfM.
+
+    * gss_libinit.h: do not use the same multiple include
+    protection macro as krb5_libinit.h.  Changed to GSSAPI_LIBINIT_H.
+
 2003-02-11  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in ($(BUILDTOP)/include/gssapi/gssapi.h): Add

diff --git a/src/lib/gssapi/gss_libinit.c b/src/lib/gssapi/gss_libinit.c
index c8fbf22f50e3f430de888feb18d64170e52f953f..51d2cb154f1672c0403ea2e3d3b4c4a61d8550bf 100644 (file)
--- a/src/lib/gssapi/gss_libinit.c
+++ b/src/lib/gssapi/gss_libinit.c
@@ -1,10 +1,5 @@
 #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"
@@ -44,8 +39,10 @@ void gssint_cleanup_library (void)
        
        (void) kg_release_defcred (&min_stat);
        
+#if !TARGET_OS_MAC || USE_HARDCODED_FALLBACK_ERROR_TABLES
        remove_error_table(&et_k5g_error_table);
        remove_error_table(&et_ggss_error_table);
+#endif
        
        initialized = 0;
 }

diff --git a/src/lib/gssapi/gss_libinit.h b/src/lib/gssapi/gss_libinit.h
index ba89ff3978cb5b479fa8344d3ea2b849cc458638..5a366042635ac58957eeef13e1b0b6dc405e302d 100644 (file)
--- a/src/lib/gssapi/gss_libinit.h
+++ b/src/lib/gssapi/gss_libinit.h
@@ -1,9 +1,9 @@
-#ifndef KRB5_LIBINIT_H
-#define KRB5_LIBINIT_H
+#ifndef GSSAPI_LIBINIT_H
+#define GSSAPI_LIBINIT_H
 
 #include "gssapi.h"
 
 OM_uint32 gssint_initialize_library (void);
 void gssint_cleanup_library (void);
 
-#endif /* KRB5_LIBINIT_H */
+#endif /* GSSAPI_LIBINIT_H */