From: Alexandra Ellwood <lxs@mit.edu>
Date: Thu, 6 Mar 2003 20:21:26 +0000 (+0000)
Subject: * gss_libinit.c: Removed Mac header goober. Fixed USE_HARDCODED_FALLBACK_ERROR_TABLES... 
X-Git-Tag: krb5-1.3-alpha1~26
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0285706b4f2025153748ac0aebb580703ae8125e;p=krb5.git

* 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

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 04541f15d..27dba4b54 100644
--- 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 c8fbf22f5..51d2cb154 100644
--- 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 ba89ff397..5a3660426 100644
--- 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 */