summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/krb5/krb/ChangeLog4
-rw-r--r--src/lib/krb5/krb/Makefile.in10
-rw-r--r--src/lib/krb5/krb/configure.in1
-rw-r--r--src/lib/krb5/krb/gc_via_tkt.c2
4 files changed, 15 insertions, 2 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index d7ceab3230..73aec6e036 100644
--- 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 efd057a04a..7bc79b9c27 100644
--- 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 8a3d759ed7..6ee82e646f 100644
--- 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 09f3d09753..e8a8faca16 100644
--- 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);