From: Theodore Tso <tytso@mit.edu>
Date: Wed, 31 Mar 1999 05:19:00 +0000 (+0000)
Subject: win_glue.c (control): Call krb5_stdcc_shutdown when detaching the krb5
X-Git-Tag: krb5-1.1-beta1~250
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=758fb74c311faa0631f98fca3ef63734e9b0204c;p=krb5.git

win_glue.c (control): Call krb5_stdcc_shutdown when detaching the krb5
	library.

Makefile.in: Remove reference to the windows Krbcc32.dll library,
	since this is now dynamically loaded.

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

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index e8b7241a7..87fd50a1a 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,11 @@
+1999-03-31  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* win_glue.c (control): Call krb5_stdcc_shutdown when detaching
+		the krb5 library.
+
+	* Makefile.in: Remove reference to the windows Krbcc32.dll
+		library, since this is now dynamically loaded.
+
 Mon Feb  8 22:08:22 1999  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* Makefile.in: Link in the ccapi import library under windows.
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index a4ccc2b99..7d315f215 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -36,8 +36,6 @@ KLIBS = krb5\krb5.lib crypto\crypto.lib \
 GLIBS = gssapi\gssapi.lib
 K4LIBS = krb4\krb4.lib
 
-##DOS##CCACHE_LIB = $(SRCTOP)\windows\lib\KrbCC32.lib
-
 ##WIN16##VERLIBS=..\mit\windows\lib\vswin.lib c:\msvc\lib\ver.lib
 ##WIN32##VERLIBS=..\mit\windows\lib\vsnt.lib \
 ##WIN32##	"c:\program files\devstudio\vc\lib\version.lib"
@@ -89,7 +87,7 @@ $(PLIB): $(PLIBS) $(WLIB) $(CLIB) $(PDEF) no_glue.obj
 ##WIN32##	link $(WINDLLFLAGS) /def:$(PDEF) /out:$*.dll \
 ##WIN32##	   no_glue.obj version.res $(PLIBS) $(CLIB) $(WINLIBS)
 
-$(KLIB): $(KLIBS) $(CLIB) $(PLIB) $(WLIB) $(KDEF) k5_glue.obj $(KRB5RC) $(CCACHE_LIB)
+$(KLIB): $(KLIBS) $(CLIB) $(PLIB) $(WLIB) $(KDEF) k5_glue.obj $(KRB5RC)
 ##WIN16##	link /co /seg:400 /noe /nod /nol \
 ##WIN16##	   k5_glue, $*.dll, $*.map, \
 ##WIN16##	   $(MITLIBS) $(KLIBS) $(CLIB) $(PLIB) $(WINLIBS), $(KDEF)
@@ -100,7 +98,7 @@ $(KLIB): $(KLIBS) $(CLIB) $(PLIB) $(WLIB) $(KDEF) k5_glue.obj $(KRB5RC) $(CCACHE
 ##WIN32##	   -fo version.res $(VERSIONRC)
 ##WIN32##	link $(WINDLLFLAGS) /def:$(KDEF) /out:$*.dll \
 ##WIN32##	   k5_glue.obj version.res $(KRB5RC) $(MITLIBS) $(KLIBS) \
-##WIN32##          $(CCACHE_LIB) $(CLIB) $(PLIB) \
+##WIN32##          $(CLIB) $(PLIB) \
 ##WIN32##	   $(WINLIBS) advapi32.lib gdi32.lib
 
 $(GLIB): $(GLIBS) $(KLIB) $(CLIB) $(GDEF) gss_glue.obj
diff --git a/src/lib/win_glue.c b/src/lib/win_glue.c
index 1d4dba8cd..4793b5cab 100644
--- a/src/lib/win_glue.c
+++ b/src/lib/win_glue.c
@@ -38,6 +38,7 @@
 #include "kdb5_err.h"
 #include "profile.h"
 #include "adm_err.h"
+extern void krb5_stdcc_shutdown();
 #endif
 #ifdef GSSAPI
 #include "gssapi/generic/gssapi_err_generic.h"
@@ -372,10 +373,12 @@ control(int mode)
 	    return -104;			/* FIXME -- better error? */
 	}
 #endif
-
 	break;
 
     case DLL_SHUTDOWN:
+#ifdef KRB5
+	krb5_stdcc_shutdown();
+#endif
 	et_func = remove_error_table;
 #ifdef NEED_WINSOCK
 	WSACleanup ();