On an error, free the keyblock

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index d7ceab3230a545d7867fe25a3d921a7ce24dcf27..73aec6e036e18d3f6ee4e98f235579ab2f3aad01 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,7 @@
+Wed May 24 18:19:17 1995  Theodore Y. Ts'o  (tytso@dcl)
+
+       * gc_via_tkt.c (krb5_kdcrep2creds): On an error, free the keyblock.
+
 Tue May 23 16:28:42 1995  Theodore Y. Ts'o  (tytso@dcl)
 
        * gc_frm_kdc.c, preauth.c, t_kerb.c, t_walk_rtree.c, unparse.c:

diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index efd057a04ada63eb82443235372e01bf10f9378b..7bc79b9c27d14e1078ed88ccf1fb2b6cc8a54775 100644 (file)
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -4,6 +4,10 @@ CFLAGS = $(CCOPTS) $(DEFS)
 ##DOSLIBNAME=..\krb5.lib
 ##DOS!include $(BUILDTOP)\config\windows.in
 
+.c.o:
+       $(CC) $(CFLAGS) -c $(srcdir)/$*.c
+@SHARED_RULE@
+
 OBJS=  addr_comp.$(OBJEXT)     \
        addr_order.$(OBJEXT)    \
        addr_srch.$(OBJEXT)     \
@@ -130,7 +134,10 @@ SRCS=      $(srcdir)/addr_comp.c   \
        $(srcdir)/unparse.c     \
        $(srcdir)/walk_rtree.c
 
-all:: $(OBJS)
+all:: shared $(OBJS)
+
+shared:
+       mkdir shared
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
@@ -173,3 +180,4 @@ check-windows::
 clean::
        $(RM) t_walk_rtree$(EXEEXT) t_walk_rtree.$(OBJEXT)
        $(RM) t_kerb$(EXEEXT) t_kerb.$(OBJEXT)
+       $(RM) shared/*

diff --git a/src/lib/krb5/krb/configure.in b/src/lib/krb5/krb/configure.in
index 8a3d759ed79a4f4c0808fc6baedcff61eff5326f..6ee82e646fe11d27aa517adbf15170aff5959c35 100644 (file)
--- a/src/lib/krb5/krb/configure.in
+++ b/src/lib/krb5/krb/configure.in
@@ -6,6 +6,7 @@ WITH_NETLIB
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
+V5_SHARED_LIB_OBJS
 SubdirLibraryRule([$(OBJS)])
 KRB_INCLUDE
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/lib/krb5/krb/gc_via_tkt.c b/src/lib/krb5/krb/gc_via_tkt.c
index 09f3d0975311bd5ec12895fcb9c9f80c6a47ff59..e8a8faca16886154fca3633b96ed2661da534a1c 100644 (file)
--- a/src/lib/krb5/krb/gc_via_tkt.c
+++ b/src/lib/krb5/krb/gc_via_tkt.c
@@ -89,7 +89,7 @@ krb5_kdcrep2creds(context, pkdcrep, address, psectkt, ppcreds)
     return 0;
 
 cleanup_keyblock:
-    memset((*ppcreds)->keyblock.contents, 0, (*ppcreds)->keyblock.length);
+    krb5_free_keyblock(context, (*ppcreds)->keyblock);
 
 cleanup:
     free (*ppcreds);