From: Richard Basch <probe@mit.edu>
Date: Thu, 20 Feb 1997 06:13:01 +0000 (+0000)
Subject: kpasswd.c: Removed unneeded call to krb5_init_ets and unused #define
X-Git-Tag: krb5-1.1-beta1~1269
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0735033341110014612ec43ed56ded2c9db381fb;p=krb5.git

kpasswd.c: Removed unneeded call to krb5_init_ets and unused #define
tty_kpasswd.c: Don't add a meaningless local abstraction

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

diff --git a/src/kadmin/passwd/kpasswd.c b/src/kadmin/passwd/kpasswd.c
index 48cb4ccc5..b56292e89 100644
--- a/src/kadmin/passwd/kpasswd.c
+++ b/src/kadmin/passwd/kpasswd.c
@@ -13,7 +13,6 @@ static char rcsid[] = "$Id$";
 
 #include "kpasswd_strings.h"
 #define string_text error_message
-#define initialize_kpasswd_strings initialize_kpws_error_table
 
 #include <stdio.h>
 #include <pwd.h>
@@ -96,8 +95,6 @@ kpasswd(context, argc, argv)
       /*NOTREACHED*/
     }
 
-  krb5_init_ets(context);
-
   /************************************
    *  Get principal name to change    * 
    ************************************/
diff --git a/src/kadmin/passwd/tty_kpasswd.c b/src/kadmin/passwd/tty_kpasswd.c
index 6d865a020..a7321516d 100644
--- a/src/kadmin/passwd/tty_kpasswd.c
+++ b/src/kadmin/passwd/tty_kpasswd.c
@@ -13,7 +13,6 @@ static char rcsid[] = "$Id$";
 
 #include "kpasswd_strings.h"
 #define string_text error_message
-#define initialize_kpasswd_strings initialize_kpws_error_table
 
 #include <stdio.h>
 #include <pwd.h>
@@ -63,14 +62,14 @@ main(argc, argv)
   krb5_context context;
   int retval;
 
-  initialize_kpasswd_strings();
-
   whoami = (whoami = strrchr(argv[0], '/')) ? whoami + 1 : argv[0];
 
   if (retval = krb5_init_context(&context)) {
        com_err(whoami, retval, "initializing krb5 context");
        exit(retval);
   }
+  initialize_kpws_error_table();
+
   retval = kpasswd(context, argc, argv);
 
   if (!retval)