diff options
| author | Theodore Tso <tytso@mit.edu> | 1995-05-24 22:21:06 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1995-05-24 22:21:06 +0000 |
| commit | 7f1c64916413b9f54145e9d7db7eefe15e954aa5 (patch) | |
| tree | 08829af34e3cab4d2d62bee6cbf232a0a3f7653d /src | |
| parent | c08b3cf5c4f445653681459f7c37196e1b83b4e6 (diff) | |
| download | krb5-7f1c64916413b9f54145e9d7db7eefe15e954aa5.tar.gz krb5-7f1c64916413b9f54145e9d7db7eefe15e954aa5.tar.xz krb5-7f1c64916413b9f54145e9d7db7eefe15e954aa5.zip | |
On an error, free the keyblock
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5868 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/krb/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lib/krb5/krb/Makefile.in | 10 | ||||
| -rw-r--r-- | src/lib/krb5/krb/configure.in | 1 | ||||
| -rw-r--r-- | src/lib/krb5/krb/gc_via_tkt.c | 2 |
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); |