* 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

diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog
index 1682ef750e1259e6eed4b9a1b8a7e1b30ae1a310..ab44c96d9088cfcf82db56df979de78ca52d513e 100644 (file)
--- 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 ff1c23d66de2ddad6204e28f7b0dbdd9a1c17d04..20a56a517a89998ea16da1621aa33927f6cf76dd 100644 (file)
--- 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 533b3b7fb79f6c6b2b347928c4a4007fa31af2eb..e3a4d9aa1217f23c1773473f0c2e637d917d159b 100644 (file)
--- 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) {