svn commit: samba r20139 - in branches/SAMBA_4_0/source/heimdal/lib/gssapi/krb5: .

[Andrew Bartlett]

On Tue, 2006-12-12 at 22:38 +0000, metze at samba.org wrote:
> Author: metze
> Date: 2006-12-12 22:38:23 +0000 (Tue, 12 Dec 2006)
> New Revision: 20139
> 
> WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20139
> 
> Log:
> only add GSS_C_CONF_FLAG and GSS_C_INTEG_FLAG if the caller requested it!
> 
> this is needed to create plain, singed or sealed LDAP connections.
> 
> this should go into lorikeet and main heimdal...

Can you merge them into lorikeet-heimdal?  Otherwise, this will be
lost...

> metze
> Modified:
>    branches/SAMBA_4_0/source/heimdal/lib/gssapi/krb5/init_sec_context.c
> 
> 
> Changeset:
> Modified: branches/SAMBA_4_0/source/heimdal/lib/gssapi/krb5/init_sec_context.c
> ===================================================================
> --- branches/SAMBA_4_0/source/heimdal/lib/gssapi/krb5/init_sec_context.c	2006-12-12 22:34:35 UTC (rev 20138)
> +++ branches/SAMBA_4_0/source/heimdal/lib/gssapi/krb5/init_sec_context.c	2006-12-12 22:38:23 UTC (rev 20139)
> @@ -470,8 +470,11 @@
>      if (req_flags & GSS_C_EXTENDED_ERROR_FLAG)
>  	flags |= GSS_C_EXTENDED_ERROR_FLAG;
>  
> -    flags |= GSS_C_CONF_FLAG;
> -    flags |= GSS_C_INTEG_FLAG;
> +    if (req_flags & GSS_C_CONF_FLAG)
> +        flags |= GSS_C_CONF_FLAG;
> +    if (req_flags & GSS_C_INTEG_FLAG)
> +        flags |= GSS_C_INTEG_FLAG;
> +
>      flags |= GSS_C_TRANS_FLAG;
>      
>      if (ret_flags)
-- 
Andrew Bartlett <abartlet at samba.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://lists.samba.org/archive/samba-technical/attachments/20061213/d571e7cc/attachment.bin