From patchwork Mon Jun 13 15:45:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kevin Coffman X-Patchwork-Id: 875082 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5DFjKXg010304 for ; Mon, 13 Jun 2011 15:45:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751126Ab1FMPpT (ORCPT ); Mon, 13 Jun 2011 11:45:19 -0400 Received: from mail-vx0-f174.google.com ([209.85.220.174]:62558 "EHLO mail-vx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750864Ab1FMPpR convert rfc822-to-8bit (ORCPT ); Mon, 13 Jun 2011 11:45:17 -0400 Received: by vxi39 with SMTP id 39so3700225vxi.19 for ; Mon, 13 Jun 2011 08:45:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=w2/3UK0PLdidFCJeyQ26hdRv3p8OkUTymF34/mSK0K0=; b=ozqSN2VHiZ6v+zX0dRqpZXm+kUksoPC1YCSmY7mr5LpCXyVJBNDIQ68LPs6z6decdk huAcLwspopWReONkcyTURqhWG94Xv/Z8pR8mca9btyBpqBLxG//J8jc5Ix4dXoDJ49Nb 4i8fhfAXo9pLOxPeyN0aCLpcVXtnDIu3LZOTM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=SWl3sSlH3vMwnP5Fpi72qunw35RLk+mV59r8TjMzcBaY5w2KYqn99THvgto8NjNT9C 9Pq7E7tw08cFYfBwF5hZVQFwH+cMX77eQGzL7qEKvE2AOsNDJmBnHM11NiA0qM/frEcd ynb31Yrb+pyirKSAjZVMITJ+gryKy4bwNMwdk= MIME-Version: 1.0 Received: by 10.52.97.232 with SMTP id ed8mr2536878vdb.84.1307979914969; Mon, 13 Jun 2011 08:45:14 -0700 (PDT) Received: by 10.52.113.40 with HTTP; Mon, 13 Jun 2011 08:45:14 -0700 (PDT) In-Reply-To: References: <20110609013756.GA5304@master.debian.org> Date: Mon, 13 Jun 2011 11:45:14 -0400 X-Google-Sender-Auth: WpyK4hpiccZFQ3mh-XRC3AHdg_M Message-ID: Subject: Re: libgssglue: incompatible with krb5 1.9 From: Kevin Coffman To: Sam Hartman Cc: Didier Raboud , linux-nfs@vger.kernel.org, 629553@bugs.debian.org, 629692@bugs.debian.org Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 13 Jun 2011 15:45:20 +0000 (UTC) Hi, Here is a patch that fixed the compile and seems to run fine. I'll be putting out a new version of libgssglue, but it may take a few days for me to get around to that. Meanwhile, hopefully this fixes your immediate issue. K.C. On Thu, Jun 9, 2011 at 10:29 AM, Sam Hartman wrote: > Here's the MIT diff that introduces the types: > commit 21479bb4df589793a4fc25aedb59d599043eb95b > Author: lhoward > Date:   Sun Apr 3 08:02:53 2011 +0000 > >    Use RFC 5587 const types for draft-josefsson-gss-capsulate APIs > >    git-svn-id: svn://anonsvn.mit.edu/svn/krb5/trunk@24821 dc483132-0cff-0310-8789-dd5450dbe970 >    (cherry picked from commit 4a46936a36f47e54134b24d7083cfd45a2d009bc) > > diff --git a/src/lib/gssapi/generic/gssapi_ext.h b/src/lib/gssapi/generic/gssapi_ext.h > index a2a8bcd..31d972b 100644 > --- a/src/lib/gssapi/generic/gssapi_ext.h > +++ b/src/lib/gssapi/generic/gssapi_ext.h > @@ -387,22 +387,22 @@ OM_uint32 KRB5_CALLCONV gss_release_any_name_mapping >  /* draft-josefsson-gss-capsulate */ >  OM_uint32 KRB5_CALLCONV gss_encapsulate_token >  ( > -    const gss_buffer_t, /* input_token */ > -    const gss_OID,      /* token_oid */ > -    const gss_buffer_t  /* output_token */ > +    gss_const_buffer_t, /* input_token */ > +    gss_const_OID,      /* token_oid */ > +    gss_buffer_t        /* output_token */ >  ); > >  OM_uint32 KRB5_CALLCONV gss_decapsulate_token >  ( > -    const gss_buffer_t, /* input_token */ > -    const gss_OID,      /* token_oid */ > +    gss_const_buffer_t, /* input_token */ > +    gss_const_OID,      /* token_oid */ >     gss_buffer_t        /* output_token */ >  ); > >  int KRB5_CALLCONV gss_oid_equal >  ( > -    const gss_OID,      /* first_oid */ > -    const gss_OID       /* second_oid */ > +    gss_const_OID,      /* first_oid */ > +    gss_const_OID       /* second_oid */ >  ); > >  #ifdef __cplusplus > diff --git a/src/lib/gssapi/mechglue/g_decapsulate_token.c b/src/lib/gssapi/mechglue/g_decapsulate_token.c > index a12d8f7..42b9e07 100644 > --- a/src/lib/gssapi/mechglue/g_decapsulate_token.c > +++ b/src/lib/gssapi/mechglue/g_decapsulate_token.c > @@ -33,8 +33,8 @@ >  #include "mglueP.h" > >  OM_uint32 > -gss_decapsulate_token(const gss_buffer_t input_token, > -                      const gss_OID token_oid, > +gss_decapsulate_token(gss_const_buffer_t input_token, > +                      gss_const_OID token_oid, >                       gss_buffer_t output_token) >  { >     OM_uint32 minor; > diff --git a/src/lib/gssapi/mechglue/g_encapsulate_token.c b/src/lib/gssapi/mechglue/g_encapsulate_token.c > index a60c796..b26e147 100644 > --- a/src/lib/gssapi/mechglue/g_encapsulate_token.c > +++ b/src/lib/gssapi/mechglue/g_encapsulate_token.c > @@ -33,8 +33,8 @@ >  #include "mglueP.h" > >  OM_uint32 > -gss_encapsulate_token(const gss_buffer_t input_token, > -                      const gss_OID token_oid, > +gss_encapsulate_token(gss_const_buffer_t input_token, > +                      gss_const_OID token_oid, >                       gss_buffer_t output_token) >  { >     unsigned int tokenSize; > diff --git a/src/lib/gssapi/mechglue/g_oid_ops.c b/src/lib/gssapi/mechglue/g_oid_ops.c > index aa6d807..db3cd78 100644 > --- a/src/lib/gssapi/mechglue/g_oid_ops.c > +++ b/src/lib/gssapi/mechglue/g_oid_ops.c > @@ -111,8 +111,8 @@ gssint_copy_oid_set( > >  int >  gss_oid_equal( > -    const gss_OID first_oid, > -    const gss_OID second_oid) > +    gss_const_OID first_oid, > +    gss_const_OID second_oid) >  { >     return g_OID_equal(first_oid, second_oid); >  } > > --- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/gssglue/gssapi/gssapi.h.in b/src/gssglue/gssapi/gssapi.h.in index 8d3fe99..81df675 100644 --- a/src/gssglue/gssapi/gssapi.h.in +++ b/src/gssglue/gssapi/gssapi.h.in @@ -850,4 +850,15 @@ PROTOTYPE( (OM_uint32 *, /* minor_status */ /* XXXX This is a necessary evil until the spec is fixed */ #define GSS_S_CRED_UNAVAIL GSS_S_FAILURE +/* + * RFC 5587 + */ +typedef const gss_buffer_desc *gss_const_buffer_t; +typedef const struct gss_channel_bindings_struct *gss_const_channel_bindings_t; +typedef const struct gss_ctx_id_struct gss_const_ctx_id_t; +typedef const struct gss_cred_id_struct gss_const_cred_id_t; +typedef const struct gss_name_struct gss_const_name_t; +typedef const gss_OID_desc *gss_const_OID; +typedef const gss_OID_set_desc *gss_const_OID_set; + #endif /* _GSSAPI_H_GLUE_ */