From: Greg Hudson <ghudson@mit.edu>
Date: Wed, 18 Dec 2013 16:59:56 +0000 (-0500)
Subject: Remove unused krb5_context fields
X-Git-Tag: krb5-1.13-alpha1~285
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c91f2a285e77e71bd283483d583c68e76eb3a0dd;p=thirdparty%2Fkrb5.git

Remove unused krb5_context fields

The vtbl and locate_fptrs fields were ostensibly related to the locate
pluggable interface, but weren't actually used.
---

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 4f221fbeee..bbc7fab8e8 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -1151,8 +1151,6 @@ struct _krb5_context {
 
     /* locate_kdc module stuff */
     struct plugin_dir_handle libkrb5_plugins;
-    struct krb5plugin_service_locate_ftable *vtbl;
-    void (**locate_fptrs)(void);
 
     /* preauth module stuff */
     krb5_preauth_context *preauth_context;
diff --git a/src/lib/krb5/krb/copy_ctx.c b/src/lib/krb5/krb/copy_ctx.c
index 5d84170030..0bc92f814b 100644
--- a/src/lib/krb5/krb/copy_ctx.c
+++ b/src/lib/krb5/krb/copy_ctx.c
@@ -80,8 +80,6 @@ krb5_copy_context(krb5_context ctx, krb5_context *nctx_out)
     nctx->os_context.default_ccname = NULL;
 
     memset(&nctx->libkrb5_plugins, 0, sizeof(nctx->libkrb5_plugins));
-    nctx->vtbl = NULL;
-    nctx->locate_fptrs = NULL;
 
     memset(&nctx->err, 0, sizeof(nctx->err));
 
diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c
index ff6061a2ca..09809b9325 100644
--- a/src/lib/krb5/os/init_os_ctx.c
+++ b/src/lib/krb5/os/init_os_ctx.c
@@ -428,7 +428,6 @@ k5_os_init_context(krb5_context ctx, profile_t profile, krb5_flags flags)
     os_ctx->os_flags = 0;
     os_ctx->default_ccname = 0;
 
-    ctx->vtbl = 0;
     PLUGIN_DIR_INIT(&ctx->libkrb5_plugins);
     ctx->preauth_context = NULL;