gss_ctx_id_t needed in ssh_gssapi_client struct to pass to

globus_gss_assist_map_and_authorize()

diff --git a/openssh/gss-serv.c b/openssh/gss-serv.c
index 54183da6868ce708b5bc5d4c1f0e83dfd8f83103..90c3ef1e28cb7cdbaa0076ea30c9f8c05e587742 100644 (file)
--- a/openssh/gss-serv.c
+++ b/openssh/gss-serv.c
@@ -276,6 +276,10 @@ ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
        /* We can't copy this structure, so we just move the pointer to it */
        client->creds = ctx->client_creds;
        ctx->client_creds = GSS_C_NO_CREDENTIAL;
+
+    /* needed for globus_gss_assist_map_and_authorize() */
+    client->context = ctx->context;
+
        return (ctx->major);
 }
 

diff --git a/openssh/ssh-gss.h b/openssh/ssh-gss.h
index c1a8dc90c4df7cd0bd69c96fead10ff0c9104e72..8b510ad1e3ea0b003e60ad773ec3c09dc6cb68af 100644 (file)
--- a/openssh/ssh-gss.h
+++ b/openssh/ssh-gss.h
@@ -87,6 +87,7 @@ typedef struct {
        gss_cred_id_t creds;
        struct ssh_gssapi_mech_struct *mech;
        ssh_gssapi_ccache store;
+    gss_ctx_id_t context;
 } ssh_gssapi_client;
 
 typedef struct ssh_gssapi_mech_struct {