Must still use knowledge of the glue context for pre-1.4 versions of MIT krb5

	We need to get access to the internal krb5 context pointer for
	older (pre-1.4) versions of MIT Kerberos.  We get a pointer to
	the gss glue's context.  Get the right pointer before accessing
	the context information.
	(really this time)

diff --git a/ChangeLog b/ChangeLog
index 5b59000f99dd1acad792f9a46bfc6e3260d71adb..663fa5bdf9c2423f1f3ea5484d22e05845d576c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-28 kwc@citi.umich.edu
+       Must still use knowledge of the glue context for pre-1.4 versions of MIT krb5
+       
+       We need to get access to the internal krb5 context pointer for
+       older (pre-1.4) versions of MIT Kerberos.  We get a pointer to
+       the gss glue's context.  Get the right pointer before accessing
+       the context information.
+       (really this time)
+       
 2006-03-28 kwc@citi.umich.edu
        
        Remove unused groups variable from get_ids() which was causing a compiler warning.

diff --git a/utils/gssd/context_mit.c b/utils/gssd/context_mit.c
index ba94fd86a628caf69fd1d9403e90338fb17c5c46..c804f3a11bc00fe77d1cb9c5877b802f936ebc74 100644 (file)
--- a/utils/gssd/context_mit.c
+++ b/utils/gssd/context_mit.c
@@ -294,10 +294,21 @@ write_keyblock(char **p, char *end, struct _krb5_keyblock *arg)
        return 0;
 }
 
+/*
+ * We really shouldn't know about glue-layer context structure, but
+ * we need to get at the real krb5 context pointer.  This should be
+ * removed as soon as we say there is no support for MIT Kerberos
+ * prior to 1.4 -- which gives us "legal" access to the context info.
+ */
+typedef struct gss_union_ctx_id_t {
+       gss_OID         mech_type;
+       gss_ctx_id_t    internal_ctx_id;
+} gss_union_ctx_id_desc, *gss_union_ctx_id_t;
+
 int
 serialize_krb5_ctx(gss_ctx_id_t ctx, gss_buffer_desc *buf)
 {
-       krb5_gss_ctx_id_t       kctx = (krb5_gss_ctx_id_t)ctx;
+       krb5_gss_ctx_id_t kctx = ((gss_union_ctx_id_t)ctx)->internal_ctx_id;
        char *p, *end;
        static int constant_one = 1;
        static int constant_zero = 0;