From: Ken Raeburn <raeburn@mit.edu>
Date: Mon, 26 Mar 2007 08:58:30 +0000 (+0000)
Subject: Remove unused scc_default_format field from krb5_context
X-Git-Tag: krb5-1.7-alpha1~1216
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7497f9206ed90a3a7da23d5da732bde19a40c72;p=krb5.git

Remove unused scc_default_format field from krb5_context

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

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 2ff107c4b..99b157921 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -1231,7 +1231,6 @@ struct _krb5_context {
 	krb5_flags	library_options;
 	krb5_boolean	profile_secure;
 	int		fcc_default_format;
-	int		scc_default_format;
 	krb5_prompt_type *prompt_types;
 	/* Message size above which we'll try TCP first in send-to-kdc
 	   type code.  Aside from the 2**16 size limit, we put no
diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index b80fd50fa..be20c4067 100644
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -234,7 +234,6 @@ init_common (krb5_context *context, krb5_boolean secure, krb5_boolean kdc)
 	profile_get_integer(ctx->profile, "libdefaults", "ccache_type",
 			    0, DEFAULT_CCACHE_TYPE, &tmp);
 	ctx->fcc_default_format = tmp + 0x0500;
-	ctx->scc_default_format = tmp + 0x0500;
 	ctx->prompt_types = 0;
 	ctx->use_conf_ktypes = 0;
 
diff --git a/src/lib/krb5/krb/ser_ctx.c b/src/lib/krb5/krb/ser_ctx.c
index d48f61e83..e76b650d2 100644
--- a/src/lib/krb5/krb/ser_ctx.c
+++ b/src/lib/krb5/krb/ser_ctx.c
@@ -117,7 +117,6 @@ krb5_context_size(krb5_context kcontext, krb5_pointer arg, size_t *sizep)
      *  krb5_int32			for library_options
      *  krb5_int32			for profile_secure
      * 	krb5_int32			for fcc_default_format
-     *  krb5_int32			for scc_default_format
      *    <>				for os_context
      *    <>				for db_context
      *    <>				for profile
@@ -282,12 +281,6 @@ krb5_context_externalize(krb5_context kcontext, krb5_pointer arg, krb5_octet **b
     if (kret)
 	return (kret);
 
-    /* Now scc_default_format */
-    kret = krb5_ser_pack_int32((krb5_int32) context->scc_default_format,
-			       &bp, &remain);
-    if (kret)
-	return (kret);
-
     /* Now handle os_context, if appropriate */
     if (context->os_context) {
 	kret = krb5_externalize_opaque(kcontext, KV5M_OS_CONTEXT,
@@ -456,11 +449,6 @@ krb5_context_internalize(krb5_context kcontext, krb5_pointer *argp, krb5_octet *
 	goto cleanup;
     context->fcc_default_format = (int) ibuf;
 
-    /* scc_default_format */
-    if ((kret = krb5_ser_unpack_int32(&ibuf, &bp, &remain)))
-	goto cleanup;
-    context->scc_default_format = (int) ibuf;
-    
     /* Attempt to read in the os_context.  It's an array now, but
        we still treat it in most places as a separate object with
        a pointer.  */