From: Ken Raeburn <raeburn@mit.edu>
Date: Wed, 7 Jul 2004 21:41:53 +0000 (+0000)
Subject: * disp_status.c: Include gss_libinit.h.
X-Git-Tag: krb5-1.4-beta1~243
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3e62c80a2da1c16dd9ba08c54d7412d5975236d3;p=krb5.git

* disp_status.c: Include gss_libinit.h.
(init_et): Variable deleted.
(krb5_gss_display_status): Don't use init_et; instead, call
gssint_initialize_library.

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

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 2b77951aa..17809e20e 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-07  Ken Raeburn  <raeburn@mit.edu>
+
+	* disp_status.c: Include gss_libinit.h.
+	(init_et): Variable deleted.
+	(krb5_gss_display_status): Don't use init_et; instead, call
+	gssint_initialize_library.
+
 2004-07-06  Ken Raeburn  <raeburn@mit.edu>
 
 	* import_name.c [HAVE_GETPWUID_R]: Include stdio.h.
diff --git a/src/lib/gssapi/krb5/disp_status.c b/src/lib/gssapi/krb5/disp_status.c
index c49ce1294..1988d50c6 100644
--- a/src/lib/gssapi/krb5/disp_status.c
+++ b/src/lib/gssapi/krb5/disp_status.c
@@ -21,16 +21,13 @@
  */
 
 #include "gssapiP_krb5.h"
+#include "gss_libinit.h"
 #include "com_err.h"
 
 /* XXXX internationalization!! */
 
 /**/
 
-static int init_et = 0;
-
-/**/
-
 OM_uint32
 krb5_gss_display_status(minor_status, status_value, status_type,
 			mech_type, message_context, status_string)
@@ -55,10 +52,7 @@ krb5_gss_display_status(minor_status, status_value, status_type,
       return(g_display_major_status(minor_status, status_value,
 				    message_context, status_string));
    } else if (status_type == GSS_C_MECH_CODE) {
-      if (!init_et) {
-	 initialize_k5g_error_table();
-	 init_et = 1;
-      }
+      (void) gssint_initialize_library();
 
       if (*message_context) {
 	 *minor_status = (OM_uint32) G_BAD_MSG_CTX;