Merge V1_0_FREEZE_3 into the mainline. (Note this merge does *not*

include the doc subtree!!)

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

6 files changed, 20 insertions, 5 deletions

diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index 73dcd5a..bfc97a8 100644
--- a/src/kadmin/testing/scripts/ChangeLog
+++ b/src/kadmin/testing/scripts/ChangeLog
@@ -3,6 +3,10 @@ Tue Dec  3 15:28:53 1996  Barry Jaspan  <bjaspan@mit.edu>
 	* init_db: be verbose when $SRVTCL doesn't exist, instead of just
  	failing [krb5-admin/245]
 
+Thu Dec  5 19:34:09 1996  Tom Yu  <tlyu@mit.edu>
+
+	* save_files.sh (files): Also save /etc/krb5.keytab. [PR 278]
+
 Thu Nov 14 15:28:16 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* env-setup.shin, init_db, save_files.sh, start_servers,
diff --git a/src/kadmin/testing/scripts/save_files.sh b/src/kadmin/testing/scripts/save_files.sh
index 14fe892..7218203 100644
--- a/src/kadmin/testing/scripts/save_files.sh
+++ b/src/kadmin/testing/scripts/save_files.sh
@@ -15,7 +15,7 @@ done
 # 	/.secure/etc/passwd /etc/athena/inetd.conf"
 
 files="/etc/krb.conf /etc/krb.realms /etc/athena/krb.conf \
-	/etc/athena/krb.realms /etc/v5srvtab"
+	/etc/athena/krb.realms /etc/v5srvtab /etc/krb5.keytab"
 
 name=`basename $0`
 
diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog
index e324ed6..698414a 100644
--- a/src/kadmin/testing/util/ChangeLog
+++ b/src/kadmin/testing/util/ChangeLog
@@ -1,3 +1,16 @@
+Fri Dec  6 00:04:10 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+	* test.c: Change test looking for tcl 7.05 and greater to be tcl
+		7.04 and greater, since BSDI ships with tcl 7.04, and
+		needs this change.  [PR#282]
+
+Thu Dec  5 22:47:27 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+	* tcl_ovsec_kadm.c: 
+	* tcl_kadm5.c: Remove #include of <malloc.h>, which is not
+ 		guaranteed to be there.  #include of <stdlib.h> is all you
+ 		need for malloc(), per ANSI.  [PR#281]
+
 Wed Nov 13 09:55:05 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in (clean): Remove built programs.
diff --git a/src/kadmin/testing/util/tcl_kadm5.c b/src/kadmin/testing/util/tcl_kadm5.c
index 2aa3663..409f023 100644
--- a/src/kadmin/testing/util/tcl_kadm5.c
+++ b/src/kadmin/testing/util/tcl_kadm5.c
@@ -4,7 +4,6 @@
 #define USE_KADM5_API_VERSION 2
 #include <kadm5/admin.h>
 #include <com_err.h>
-#include <malloc.h>
 #include <k5-int.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/kadmin/testing/util/tcl_ovsec_kadm.c b/src/kadmin/testing/util/tcl_ovsec_kadm.c
index 0c6aaac..40a854e 100644
--- a/src/kadmin/testing/util/tcl_ovsec_kadm.c
+++ b/src/kadmin/testing/util/tcl_ovsec_kadm.c
@@ -4,7 +4,6 @@
 #define USE_KADM5_API_VERSION 1
 #include <kadm5/admin.h>
 #include <com_err.h>
-#include <malloc.h>
 #include <k5-int.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/kadmin/testing/util/test.c b/src/kadmin/testing/util/test.c
index 75a0fc2..f9da052 100644
--- a/src/kadmin/testing/util/test.c
+++ b/src/kadmin/testing/util/test.c
@@ -1,8 +1,8 @@
 #include <tcl.h>
 
-#define IS_TCL_7_5 ((TCL_MAJOR_VERSION * 100 + TCL_MINOR_VERSION) >= 705)
+#define _TCL_MAIN ((TCL_MAJOR_VERSION * 100 + TCL_MINOR_VERSION) >= 704)
 
-#if IS_TCL_7_5
+#if _TCL_MAIN
 int
 main(argc, argv)
     int argc;			/* Number of command-line arguments. */