* string_table.c (str_INITING_KCONTEXT): Variable deleted.

* string_table.h (str_INITING_KCONTEXT): Declaration deleted.
* kadm5_create.c (kadm5_create, kadm5_create_magic_princs): Don't use
str_INITING_KCONTEXT, instead provide (different!) messages more appropriate to
the actual code.

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

diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 3e265b50337e8e2ef805db40a57faa8cfcbc418e..c753a2ccbb1daa9a8f31dd7f4bb0ce33c3ee0d1a 100644 (file)
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-16  Ken Raeburn  <raeburn@mit.edu>
+
+       * string_table.c (str_INITING_KCONTEXT): Variable deleted.
+       * string_table.h (str_INITING_KCONTEXT): Declaration deleted.
+       * kadm5_create.c (kadm5_create, kadm5_create_magic_princs): Don't
+       use str_INITING_KCONTEXT, instead provide (different!) messages
+       more appropriate to the actual code.
+
 2001-06-29  Ezra Peisach  <epeisach@mit.edu>
 
        * nstrtok.h: New file with prototype for nstrtok.

diff --git a/src/kadmin/dbutil/kadm5_create.c b/src/kadmin/dbutil/kadm5_create.c
index 146010c3768d29e81c578dbb42ce521043120b23..d9aa60d68f82ca8a314e6b2b796465b84ac5c13b 100644 (file)
--- a/src/kadmin/dbutil/kadm5_create.c
+++ b/src/kadmin/dbutil/kadm5_create.c
@@ -81,7 +81,7 @@ int kadm5_create(kadm5_config_params *params)
       */
      if ((retval = kadm5_get_config_params(context, NULL, NULL,
                                           params, &lparams))) {
-         com_err(progname, retval, str_INITING_KCONTEXT);
+         com_err(progname, retval, "while looking up the Kerberos configuration");
          return 1;
      }
 
@@ -111,7 +111,7 @@ int kadm5_create_magic_princs(kadm5_config_params *params,
                              KADM5_STRUCT_VERSION,
                              KADM5_API_VERSION_2,
                              &handle))) {
-         com_err(progname, retval, str_INITING_KCONTEXT);
+         com_err(progname, retval, "while initializing the Kerberos admin interface");
          return retval;
      }
 

diff --git a/src/kadmin/dbutil/string_table.c b/src/kadmin/dbutil/string_table.c
index fcf65dcfc355f7912a73dc4a820ef95ef4ff21f8..1caa1402ee71b4e67835314e4a0819fa4e00b9f0 100644 (file)
--- a/src/kadmin/dbutil/string_table.c
+++ b/src/kadmin/dbutil/string_table.c
@@ -5,8 +5,6 @@
 
 /* String table of messages for kadm5_create */
 
-char *str_INITING_KCONTEXT = "while initializing the kerberos context";
-
 char *str_PARSE_NAME = "while parsing admin principal name.";
 
 char *str_HISTORY_PARSE_NAME = "while parsing admin history principal name.";

diff --git a/src/kadmin/dbutil/string_table.h b/src/kadmin/dbutil/string_table.h
index e8cb45367cf5d994e88a090db373344099820c92..b89b9f1faff6cf8895b0bd383d391c3ca2922dcb 100644 (file)
--- a/src/kadmin/dbutil/string_table.h
+++ b/src/kadmin/dbutil/string_table.h
@@ -7,7 +7,6 @@
  
 #ifndef _OVSEC_ADM_STRINGS_
  
-extern char *str_INITING_KCONTEXT;
 extern char *str_PARSE_NAME;
 extern char *str_HISTORY_PARSE_NAME;
 extern char *str_ADMIN_PRINC_EXISTS;