pull up 3des implementation from the marc-3des branch

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

7 files changed, 27 insertions, 4 deletions

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index 8addd10cd..e9734a6f9 100644
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -6,6 +6,10 @@
 		problem where an insertion into the middle of the linked
 		list didn't update a previous link.  [krb5-libs/615]
 
+1998-07-12  Sam Hartman  <hartmans@fundsxpress.com>
+
+	* Makefile.in: Add dependency on -lcom_err
+
 Mon Mar  2 16:19:58 1998  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in: Integrate in the krb5 build tree rules.
diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index 6dd0377c8..7f566d8c2 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -36,6 +36,11 @@ MLIBS = -lcom_err $(GEN_LIB)
 LIB=profile
 LIBMAJOR=1
 LIBMINOR=0
+SHLIB_EXPDEPS = $(TOPLIBD)/libcom_err$(SHLIBEXT)
+SHLIB_EXPLIBS = -lcom_err
+SHLIB_DIRS = -L$(TOPLIBD)
+SHLIB_RDIRS=$(KRB5_LIBDIR)
+
 STOBJLISTS=OBJS.ST
 
 all-unix:: includes test_parse test_profile
diff --git a/src/util/profile/configure.in b/src/util/profile/configure.in
index 7441f615c..0594dbaa9 100644
--- a/src/util/profile/configure.in
+++ b/src/util/profile/configure.in
@@ -9,5 +9,6 @@ AC_HAVE_FUNCS(stat)
 AC_PROG_AWK
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_PROGRAM
-KRB5_BUILD_LIBRARY
+KRB5_BUILD_LIBRARY_WITH_DEPS
 V5_AC_OUTPUT_MAKEFILE
+
diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog
index 46919b61f..d5c5ba6bc 100644
--- a/src/util/pty/ChangeLog
+++ b/src/util/pty/ChangeLog
@@ -1,3 +1,7 @@
+1998-08-16    <hartmans@fundsxpress.com>
+
+	* Makefile.in (SHLIB_EXPDEPS): Depend on lib_comerr
+
 1998-07-05    <hartmans@fundsxpress.com>
 
 	* update_utmp.c (pty_update_utmp): If the ut_exit differs test
diff --git a/src/util/pty/Makefile.in b/src/util/pty/Makefile.in
index 339a11e93..1bf272b58 100644
--- a/src/util/pty/Makefile.in
+++ b/src/util/pty/Makefile.in
@@ -31,6 +31,11 @@ CFILES=$(srcdir)/cleanup.c $(srcdir)/getpty.c $(srcdir)/init_slave.c \
 
 
 SRCS=pty_err.c $(CFILES)
+SHLIB_EXPDEPS = \
+	$(TOPLIBD)/libcom_err$(SHLIBEXT)
+SHLIB_EXPLIBS= -lcom_err 
+SHLIB_DIRS=-L$(TOPLIBD)
+SHLIB_RDIRS=$(KRB5_LIBDIR)
 
 DEPLIBS=
 
diff --git a/src/util/pty/configure.in b/src/util/pty/configure.in
index 71adc940d..4c58d6ee3 100644
--- a/src/util/pty/configure.in
+++ b/src/util/pty/configure.in
@@ -150,6 +150,6 @@ fi
 dnl
 ADD_DEF(-DKERBEROS)
 AC_CONST
-KRB5_BUILD_LIBRARY
+KRB5_BUILD_LIBRARY_WITH_DEPS
 KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/util/ss/execute_cmd.c b/src/util/ss/execute_cmd.c
index 5fb0cad96..3f684052c 100644
--- a/src/util/ss/execute_cmd.c
+++ b/src/util/ss/execute_cmd.c
@@ -189,7 +189,7 @@ int ss_execute_line (sci_idx, line_ptr)
     char *line_ptr;
 {
     char **argv;
-    int argc;
+    int argc, ret;
 
     /* flush leading whitespace */
     while (line_ptr[0] == ' ' || line_ptr[0] == '\t')
@@ -212,5 +212,9 @@ int ss_execute_line (sci_idx, line_ptr)
         return 0;
 
     /* look it up in the request tables, execute if found */
-    return really_execute_command (sci_idx, argc, &argv);
+    ret = really_execute_command (sci_idx, argc, &argv);
+
+    free(argv);
+
+    return(ret);
 }