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 48cb4ccc598440533101c93a7a3a39584ea33c1b..b56292e893cacb784f132dd475b738b5e786a9de 100644 (file)
--- 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 6d865a020f9333447572e1efc83f44baf382eb7b..a7321516d9a49676d12dca8a15d6f4b7afaa097c 100644 (file)
--- 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)