From: Ken Raeburn <raeburn@mit.edu>
Date: Sun, 21 Mar 2004 01:56:39 +0000 (+0000)
Subject: One less kg_get_context call..
X-Git-Tag: krb5-1.4-beta1~526
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=115c489c9af46ade474b7653f2a4a6131b38da83;p=krb5.git

One less kg_get_context call..

* ovsec_kadmd.c (main): Use any handy krb5 context to register the KDB keytab
type, we don't need to pluck it out of the GSSAPI krb5 mechanism.
(gctx): Variable deleted.

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

diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index 272e53328..223548ad2 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-20  Ken Raeburn  <raeburn@mit.edu>
+
+	* ovsec_kadmd.c (main): Use any handy krb5 context to register
+	the KDB keytab type, we don't need to pluck it out of the GSSAPI
+	krb5 mechanism.
+	(gctx): Variable deleted.
+
 2004-02-24  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (OBJS, $(PROG)): Link against apputils lib instead
diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 4510b1bb7..b642c8927 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -193,7 +193,7 @@ static void display_status_1(m, code, type)
 /* XXX yuck.  the signal handlers need this */
 static krb5_context context;
 
-static krb5_context gctx, hctx;
+static krb5_context hctx;
 
 int main(int argc, char *argv[])
 {
@@ -500,11 +500,6 @@ int main(int argc, char *argv[])
       * This prevents kadmind from needing to use an actual file-based
       * keytab.
       */
-     ret = kg_get_context(&minor_status, &gctx);
-     if (ret) {
-	  krb5_klog_syslog(LOG_ERR, "Can't get krb5_gss internal context.");
-	  goto kterr;
-     }
      /* XXX extract kadm5's krb5_context */
      hctx = ((kadm5_server_handle_t)global_server_handle)->context;
      /* Set ktkdb's internal krb5_context. */
@@ -519,7 +514,7 @@ int main(int argc, char *argv[])
 	  krb5_klog_syslog(LOG_ERR, "Can't set master key for kdb keytab.");
 	  goto kterr;
      }
-     ret = krb5_kt_register(gctx, &krb5_kt_kdb_ops);
+     ret = krb5_kt_register(context, &krb5_kt_kdb_ops);
      if (ret) {
 	  krb5_klog_syslog(LOG_ERR, "Can't register kdb keytab.");
 	  goto kterr;