summaryrefslogtreecommitdiffstats
path: root/src/kadmin
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>1994-06-29 05:35:50 +0000
committerTom Yu <tlyu@mit.edu>1994-06-29 05:35:50 +0000
commitba0c614172f11219c430b17cd14602d9f7e629e3 (patch)
tree61c2ac5235dbd41debd8aaf0d6eb63be20e1a506 /src/kadmin
parent0ab5822efa69c6b2236b5f052775b2ce86c7c30e (diff)
downloadkrb5-ba0c614172f11219c430b17cd14602d9f7e629e3.tar.gz
krb5-ba0c614172f11219c430b17cd14602d9f7e629e3.tar.xz
krb5-ba0c614172f11219c430b17cd14602d9f7e629e3.zip
folding in Harry's changes
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3924 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin')
-rw-r--r--src/kadmin/client/Makefile.in2
-rw-r--r--src/kadmin/kpasswd/Makefile.in2
-rw-r--r--src/kadmin/server/ChangeLog4
-rw-r--r--src/kadmin/server/adm_server.c4
4 files changed, 7 insertions, 5 deletions
diff --git a/src/kadmin/client/Makefile.in b/src/kadmin/client/Makefile.in
index 2e1694ad4f..5ad562f017 100644
--- a/src/kadmin/client/Makefile.in
+++ b/src/kadmin/client/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/kadmin/kpasswd/Makefile.in b/src/kadmin/kpasswd/Makefile.in
index a7add62a46..39e7f0dfac 100644
--- a/src/kadmin/kpasswd/Makefile.in
+++ b/src/kadmin/kpasswd/Makefile.in
@@ -28,7 +28,7 @@ LDFLAGS = -g
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/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index e71cdd6baa..a1ad0ea124 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun 29 00:25:29 1994 Tom Yu (tlyu at dragons-lair)
+
+ * adm_server.c: fixed error table calls to use krb5_init_ets
+
Fri Jun 24 20:39:37 1994 Theodore Y. Ts'o (tytso at tsx-11)
* adm_process.c (cpw_keyproc): return error codes on failure
diff --git a/src/kadmin/server/adm_server.c b/src/kadmin/server/adm_server.c
index 7d2a3cb32d..a660dade8f 100644
--- a/src/kadmin/server/adm_server.c
+++ b/src/kadmin/server/adm_server.c
@@ -419,9 +419,7 @@ kdc_com_err_proc(whoami, code, format, pvar)
void
setup_com_err()
{
- initialize_krb5_error_table();
- initialize_kdb5_error_table();
- initialize_isod_error_table();
+ krb5_init_ets();
(void) set_com_err_hook(kdc_com_err_proc);
return;