summaryrefslogtreecommitdiff
path: root/source4/heimdal/lib
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-12-12 22:38:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:29:13 -0500
commitf2784a8bb0fbf4243bb959e7b9dfd3c2e108d470 (patch)
tree3a340e3c7eadf1670e7821e29c152e21c3adf029 /source4/heimdal/lib
parent6de9ae9e43be1b2a765554a2c1d36226197e3cfa (diff)
downloadsamba-f2784a8bb0fbf4243bb959e7b9dfd3c2e108d470.tar.gz
samba-f2784a8bb0fbf4243bb959e7b9dfd3c2e108d470.tar.bz2
samba-f2784a8bb0fbf4243bb959e7b9dfd3c2e108d470.zip
r20139: 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 (This used to be commit 75c037cae21714e394a63f2506387e1049eb4406)
Diffstat (limited to 'source4/heimdal/lib')
-rw-r--r--source4/heimdal/lib/gssapi/krb5/init_sec_context.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/heimdal/lib/gssapi/krb5/init_sec_context.c b/source4/heimdal/lib/gssapi/krb5/init_sec_context.c
index 7a97b6262c..27d859ddd8 100644
--- a/source4/heimdal/lib/gssapi/krb5/init_sec_context.c
+++ b/source4/heimdal/lib/gssapi/krb5/init_sec_context.c
@@ -470,8 +470,11 @@ init_auth
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)