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 e8b7241a7bde8f6beec3abc587263c2a83b345ef..87fd50a1ac1eab14c5017725193f0e15957ebdbe 100644 (file)
--- 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 a4ccc2b99a5652893e072709fc46e165d25f98d0..7d315f2151c2a97b191b797ffa4f5c796c822161 100644 (file)
--- 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 1d4dba8cdd6329422d85e91cd87d2798eb77022c..4793b5caba8ea88e0b1ae5d04580401f9f84e0bd 100644 (file)
--- 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 ();