summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-06-27 11:34:05 +0200
committerStefan Metzmacher <metze@samba.org>2008-06-27 12:43:04 +0200
commitf10c9ca3612d7bdc4c2c221e959f8c48ec2f9349 (patch)
tree86dff8bef3805ab817b1f126433362696f9e6e3b
parentd88be1a1cb543b4e2cc5d15262da786558aa276d (diff)
downloadsamba-f10c9ca3612d7bdc4c2c221e959f8c48ec2f9349.tar.gz
gsskrb5: just don't force, but allow the flags when GSS_CF_NO_CI_FLAGS is given
metze
-rw-r--r--source/heimdal/lib/gssapi/krb5/init_sec_context.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/heimdal/lib/gssapi/krb5/init_sec_context.c b/source/heimdal/lib/gssapi/krb5/init_sec_context.c
index ab7624eef0e..c455a5dc8b7 100644
--- a/source/heimdal/lib/gssapi/krb5/init_sec_context.c
+++ b/source/heimdal/lib/gssapi/krb5/init_sec_context.c
@@ -490,6 +490,12 @@ init_auth
if (req_flags & GSS_C_EXTENDED_ERROR_FLAG)
flags |= GSS_C_EXTENDED_ERROR_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;
+ }
if (cred == NULL || !(cred->cred_flags & GSS_CF_NO_CI_FLAGS)) {
flags |= GSS_C_CONF_FLAG;
flags |= GSS_C_INTEG_FLAG;