From 1d27ea36069bd2a38d3c32a720854520e7b426c6 Mon Sep 17 00:00:00 2001
From: Richard Basch <probe@mit.edu>
Date: Thu, 20 Feb 1997 06:21:46 +0000
Subject: [PATCH] Removed unneeded call to krb5_init_ets

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9927 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/kadmin.v4/server/admin_server.c | 1 -
 src/krb524/misc.c                   | 1 -
 src/lib/crypto/des/t_random.c       | 1 -
 src/lib/gssapi/krb5/disp_status.c   | 1 -
 src/lib/kadm/t_dbentry.c            | 1 -
 src/lib/kadm/t_ktentry.c            | 1 -
 src/lib/kadm5/clnt/client_init.c    | 1 -
 src/lib/kadm5/srv/server_init.c     | 3 +--
 src/lib/krb4/rd_svc_key.c           | 1 -
 9 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/kadmin.v4/server/admin_server.c b/src/kadmin.v4/server/admin_server.c
index 24e79b84d..ac4032b38 100644
--- a/src/kadmin.v4/server/admin_server.c
+++ b/src/kadmin.v4/server/admin_server.c
@@ -91,7 +91,6 @@ char *argv[];
     extern int fascist_cpw;
 
     krb5_init_context(&kadm_context);
-    krb5_init_ets(kadm_context);
     initialize_kadm_error_table();
     prog[sizeof(prog)-1]='\0';		/* Terminate... */
     (void) strncpy(prog, argv[0], sizeof(prog)-1);
diff --git a/src/krb524/misc.c b/src/krb524/misc.c
index ad69cf683..183e78918 100644
--- a/src/krb524/misc.c
+++ b/src/krb524/misc.c
@@ -34,6 +34,5 @@
 void krb524_init_ets(context)
      krb5_context context;
 {
-     krb5_init_ets(context);
      initialize_k524_error_table();
 }
diff --git a/src/lib/crypto/des/t_random.c b/src/lib/crypto/des/t_random.c
index 106bfb2fb..bc013bdab 100644
--- a/src/lib/crypto/des/t_random.c
+++ b/src/lib/crypto/des/t_random.c
@@ -80,7 +80,6 @@ main(argc,argv)
 
     /* do some initialisation */
     krb5_init_context(&context);
-    krb5_init_ets(context);
 
     krb5_use_enctype(context, &eblock, ENCTYPE_DES_CBC_CRC);
     keyblock.enctype = ENCTYPE_DES_CBC_CRC;
diff --git a/src/lib/gssapi/krb5/disp_status.c b/src/lib/gssapi/krb5/disp_status.c
index 143f7a624..4dc13843c 100644
--- a/src/lib/gssapi/krb5/disp_status.c
+++ b/src/lib/gssapi/krb5/disp_status.c
@@ -59,7 +59,6 @@ krb5_gss_display_status(minor_status, status_value, status_type,
 				    message_context, status_string));
    } else if (status_type == GSS_C_MECH_CODE) {
       if (!init_et) {
-	 krb5_init_ets(context);
 	 initialize_k5g_error_table();
 	 init_et = 1;
       }
diff --git a/src/lib/kadm/t_dbentry.c b/src/lib/kadm/t_dbentry.c
index 6c71234b3..7fa578019 100644
--- a/src/lib/kadm/t_dbentry.c
+++ b/src/lib/kadm/t_dbentry.c
@@ -736,7 +736,6 @@ do_test(pname, verbose, isrand, is_a_set, title, passno)
 
     kret = 0;
     krb5_init_context(&kcontext);
-    krb5_init_ets(kcontext);
     in_dbent = (krb5_db_entry *) malloc(sizeof(krb5_db_entry));
     out_dbent = (krb5_db_entry *) malloc(sizeof(krb5_db_entry));
     if (in_dbent && out_dbent) {
diff --git a/src/lib/kadm/t_ktentry.c b/src/lib/kadm/t_ktentry.c
index 0367947f2..8242699d0 100644
--- a/src/lib/kadm/t_ktentry.c
+++ b/src/lib/kadm/t_ktentry.c
@@ -240,7 +240,6 @@ do_test(pname, verbose, isrand, title, passno)
 
     kret = 0;
     krb5_init_context(&kcontext);
-    krb5_init_ets(kcontext);
     in_ktent = (krb5_keytab_entry *) malloc(sizeof(krb5_keytab_entry));
     out_ktent = (krb5_keytab_entry *) malloc(sizeof(krb5_keytab_entry));
     if (in_ktent && out_ktent) {
diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c
index 00951a323..d6404465e 100644
--- a/src/lib/kadm5/clnt/client_init.c
+++ b/src/lib/kadm5/clnt/client_init.c
@@ -168,7 +168,6 @@ static kadm5_ret_t _kadm5_init_any(char *client_name,
      handle->lhandle->lhandle = handle->lhandle;
 
      krb5_init_context(&handle->context);
-     krb5_init_ets(handle->context);	
 
      if(service_name == NULL || client_name == NULL) {
 	free(handle);
diff --git a/src/lib/kadm5/srv/server_init.c b/src/lib/kadm5/srv/server_init.c
index 8f147722a..a0356c4e4 100644
--- a/src/lib/kadm5/srv/server_init.c
+++ b/src/lib/kadm5/srv/server_init.c
@@ -116,11 +116,10 @@ kadm5_ret_t kadm5_init(char *client_name, char *pass,
 	 free(handle);
 	 return(ret);
     }
-     
+
     initialize_ovk_error_table();
     initialize_adb_error_table();
     initialize_ovku_error_table();
-    krb5_init_ets(handle->context);
 
     handle->magic_number = KADM5_SERVER_HANDLE_MAGIC;
     handle->struct_version = struct_version;
diff --git a/src/lib/krb4/rd_svc_key.c b/src/lib/krb4/rd_svc_key.c
index c6be216fa..5ef12d8eb 100644
--- a/src/lib/krb4/rd_svc_key.c
+++ b/src/lib/krb4/rd_svc_key.c
@@ -143,7 +143,6 @@ read_service_key(service,instance,realm,kvno,file,key)
 	return KSUCCESS;
 
     krb5_init_context(&context);
-    krb5_init_ets(context);
 
     if (!strcmp(instance, "*")) {
 	retval = krb5_sname_to_principal(context, NULL, NULL, KRB5_NT_SRV_HST,
-- 
2.26.2