folding in Harry's changes

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

12 files changed, 22 insertions, 15 deletions

diff --git a/src/admin/aname/Makefile.in b/src/admin/aname/Makefile.in
index 25ce2bd43..eb150e56f 100644
--- a/src/admin/aname/Makefile.in
+++ b/src/admin/aname/Makefile.in
@@ -28,7 +28,7 @@ KRB5_INCSUBDIRS = \
 
 SRCTOP = $(srcdir)/$(BUILDTOP)
 TOPLIBD = $(BUILDTOP)/lib
-ISODELIB=$(TOPLIBD)/libisode.a
+ISODELIB=@ISODELIB@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
diff --git a/src/admin/convert/Makefile.in b/src/admin/convert/Makefile.in
index a9899d90f..54cbf5827 100644
--- a/src/admin/convert/Makefile.in
+++ b/src/admin/convert/Makefile.in
@@ -29,7 +29,7 @@ KRB5_INCSUBDIRS = \
 
 SRCTOP = $(srcdir)/$(BUILDTOP)
 TOPLIBD = $(BUILDTOP)/lib
-ISODELIB=$(TOPLIBD)/libisode.a
+ISODELIB=@ISODELIB@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a
diff --git a/src/admin/create/ChangeLog b/src/admin/create/ChangeLog
new file mode 100644
index 000000000..5a76f9635
--- /dev/null
+++ b/src/admin/create/ChangeLog
@@ -0,0 +1,5 @@
+Wed Jun 29 00:19:17 1994  Tom Yu  (tlyu at dragons-lair)
+
+	* kdb5_create.c: fixed up something that should have been a call
+	to init_ets()
+
diff --git a/src/admin/create/Makefile.in b/src/admin/create/Makefile.in
index 88fefa30e..51ab59fd2 100644
--- a/src/admin/create/Makefile.in
+++ b/src/admin/create/Makefile.in
@@ -28,7 +28,7 @@ KRB5_INCSUBDIRS = \
 
 SRCTOP = $(srcdir)/$(BUILDTOP)
 TOPLIBD = $(BUILDTOP)/lib
-ISODELIB=$(TOPLIBD)/libisode.a
+ISODELIB=@ISODELIB@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
diff --git a/src/admin/create/kdb5_create.c b/src/admin/create/kdb5_create.c
index 113d59988..2fc736e69 100644
--- a/src/admin/create/kdb5_create.c
+++ b/src/admin/create/kdb5_create.c
@@ -136,9 +136,7 @@ char *argv[];
     int keytypedone = 0;
     krb5_enctype etype = 0xffff;
 
-    initialize_krb5_error_table();
-    initialize_kdb5_error_table();
-    initialize_isod_error_table();
+    krb5_init_ets();
 
     if (strrchr(argv[0], '/'))
 	argv[0] = strrchr(argv[0], '/')+1;
diff --git a/src/admin/destroy/ChangeLog b/src/admin/destroy/ChangeLog
new file mode 100644
index 000000000..0b249c509
--- /dev/null
+++ b/src/admin/destroy/ChangeLog
@@ -0,0 +1,4 @@
+Wed Jun 29 00:22:07 1994  Tom Yu  (tlyu at dragons-lair)
+
+	* kdb5_destroy.c: fix things to call krb5_init_ets
+
diff --git a/src/admin/destroy/Makefile.in b/src/admin/destroy/Makefile.in
index aa51dbd85..a5135b546 100644
--- a/src/admin/destroy/Makefile.in
+++ b/src/admin/destroy/Makefile.in
@@ -28,7 +28,7 @@ KRB5_INCSUBDIRS = \
 
 SRCTOP = $(srcdir)/$(BUILDTOP)
 TOPLIBD = $(BUILDTOP)/lib
-ISODELIB=$(TOPLIBD)/libisode.a
+ISODELIB=@ISODELIB@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
diff --git a/src/admin/destroy/kdb5_destroy.c b/src/admin/destroy/kdb5_destroy.c
index 94e954fd6..93dd6e70a 100644
--- a/src/admin/destroy/kdb5_destroy.c
+++ b/src/admin/destroy/kdb5_destroy.c
@@ -67,9 +67,7 @@ char *argv[];
     char dbfilename[MAXPATHLEN];
     krb5_error_code retval;
 
-    initialize_krb5_error_table();
-    initialize_kdb5_error_table();
-    initialize_isod_error_table();
+    krb5_init_ets();
 
     if (strrchr(argv[0], '/'))
 	argv[0] = strrchr(argv[0], '/')+1;
diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in
index 06cc4e72a..d4b50e866 100644
--- a/src/admin/edit/Makefile.in
+++ b/src/admin/edit/Makefile.in
@@ -28,7 +28,7 @@ KRB5_INCSUBDIRS = \
 
 SRCTOP = $(srcdir)/$(BUILDTOP)
 TOPLIBD = $(BUILDTOP)/lib
-ISODELIB=$(TOPLIBD)/libisode.a
+ISODELIB=@ISODELIB@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 SSLIB=$(BUILDTOP)/util/ss/libss.a
 DBMLIB=
diff --git a/src/admin/stash/ChangeLog b/src/admin/stash/ChangeLog
new file mode 100644
index 000000000..1044c11ad
--- /dev/null
+++ b/src/admin/stash/ChangeLog
@@ -0,0 +1,4 @@
+Wed Jun 29 00:23:09 1994  Tom Yu  (tlyu at dragons-lair)
+
+	* kdb5_stash.c: fix things that should have been krb5_init_ets
+
diff --git a/src/admin/stash/Makefile.in b/src/admin/stash/Makefile.in
index 9212f96a5..e0e44a9c7 100644
--- a/src/admin/stash/Makefile.in
+++ b/src/admin/stash/Makefile.in
@@ -28,7 +28,7 @@ KRB5_INCSUBDIRS = \
 
 SRCTOP = $(srcdir)/$(BUILDTOP)
 TOPLIBD = $(BUILDTOP)/lib
-ISODELIB=$(TOPLIBD)/libisode.a
+ISODELIB=@ISODELIB@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
diff --git a/src/admin/stash/kdb5_stash.c b/src/admin/stash/kdb5_stash.c
index 634bb4fab..758dec0d5 100644
--- a/src/admin/stash/kdb5_stash.c
+++ b/src/admin/stash/kdb5_stash.c
@@ -80,9 +80,7 @@ char *argv[];
     if (strrchr(argv[0], '/'))
 	argv[0] = strrchr(argv[0], '/')+1;
 
-    initialize_krb5_error_table();
-    initialize_kdb5_error_table();
-    initialize_isod_error_table();
+    krb5_init_ets();
 
     while ((optchar = getopt(argc, argv, "d:r:k:M:e:f:")) != EOF) {
 	switch(optchar) {