Author: metze
Date: 2006-12-12 23:45:23 +0000 (Tue, 12 Dec 2006)
New Revision: 689

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=689

Log:
merge from samba4:

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...

metze
Modified:
   trunk/heimdal/lib/gssapi/krb5/init_sec_context.c


Changeset:
Modified: trunk/heimdal/lib/gssapi/krb5/init_sec_context.c
===================================================================
--- trunk/heimdal/lib/gssapi/krb5/init_sec_context.c    2006-11-28 20:10:18 UTC 
(rev 688)
+++ trunk/heimdal/lib/gssapi/krb5/init_sec_context.c    2006-12-12 23:45:23 UTC 
(rev 689)
@@ -476,8 +476,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)

Reply via email to