diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1996-11-07 16:39:06 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1996-11-07 16:39:06 +0000 |
| commit | 663566724eb07a1e0aa0da223ec678059fc948b1 (patch) | |
| tree | 03410a40a466f85d4199a426ac5ccef79c263f38 /src/kadmin/testing | |
| parent | 18b253dc9165ccf47e08153ba3286fbccb721b3a (diff) | |
| download | krb5-663566724eb07a1e0aa0da223ec678059fc948b1.tar.gz krb5-663566724eb07a1e0aa0da223ec678059fc948b1.tar.xz krb5-663566724eb07a1e0aa0da223ec678059fc948b1.zip | |
* tcl_kadm5.c (parse_keysalts, parse_tl_data): Do not free memory
twice.
* Makefile.in: Use $(LD) instead of $(CC) for linking.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9311 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/testing')
| -rw-r--r-- | src/kadmin/testing/util/ChangeLog | 7 | ||||
| -rw-r--r-- | src/kadmin/testing/util/Makefile.in | 6 | ||||
| -rw-r--r-- | src/kadmin/testing/util/tcl_kadm5.c | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog index 1682ef750..ab44c96d9 100644 --- a/src/kadmin/testing/util/ChangeLog +++ b/src/kadmin/testing/util/ChangeLog @@ -1,3 +1,10 @@ +Thu Nov 7 11:36:15 1996 Ezra Peisach <epeisach@mit.edu> + + * tcl_kadm5.c (parse_keysalts, parse_tl_data): Do not free memory + twice. + + * Makefile.in: Use $(LD) instead of $(CC) for linking. + Fri Nov 1 13:16:43 1996 Barry Jaspan <bjaspan@mit.edu> * tcl_kadm5.c (unparse_err): update for new tl_data semantics diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in index ff1c23d66..20a56a517 100644 --- a/src/kadmin/testing/util/Makefile.in +++ b/src/kadmin/testing/util/Makefile.in @@ -19,10 +19,10 @@ all-:: all-tcl:: $(CLNTPROG) $(SRVPROG) $(SRVPROG): $(OBJS) $(SRVDEPLIBS) - $(CC) $(LDFLAGS) $(LDARGS) -o $(SRVPROG) $(OBJS) $(SRVLIBS) $(TCLLIB) + $(LD) $(LDFLAGS) $(LDARGS) -o $(SRVPROG) $(OBJS) $(SRVLIBS) $(TCLLIB) $(CLNTPROG): $(OBJS) $(CLNTDEPLIBS) - $(CC) $(LDFLAGS) $(LDARGS) -o $(CLNTPROG) $(OBJS) $(CLNTLIBS) $(TCLLIB) + $(LD) $(LDFLAGS) $(LDARGS) -o $(CLNTPROG) $(OBJS) $(CLNTLIBS) $(TCLLIB) bsddb_dump: bsddb_dump.o - $(CC) $(LDFLAGS) $(LDARGS) -o bsddb_dump bsddb_dump.o $(SRVLIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o bsddb_dump bsddb_dump.o $(SRVLIBS) diff --git a/src/kadmin/testing/util/tcl_kadm5.c b/src/kadmin/testing/util/tcl_kadm5.c index 533b3b7fb..e3a4d9aa1 100644 --- a/src/kadmin/testing/util/tcl_kadm5.c +++ b/src/kadmin/testing/util/tcl_kadm5.c @@ -809,6 +809,7 @@ static int parse_keysalts(Tcl_Interp *interp, char *list, (*keysalts)[i].ks_salttype = tmp; free(argv1); + argv1 = NULL; } finished: @@ -931,6 +932,7 @@ static int parse_tl_data(Tcl_Interp *interp, char *list, strcpy(tl->tl_data_contents, argv1[2]); free(argv1); + argv1 = NULL; tl = tl->tl_data_next; } if (tl != NULL) { |