From: Stefan Metzmacher Date: Fri, 27 Jun 2008 09:34:05 +0000 (+0200) Subject: gsskrb5: just don't force, but allow the flags when GSS_CF_NO_CI_FLAGS is given X-Git-Tag: samba-4.0.0alpha5~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f10c9ca3612d7bdc4c2c221e959f8c48ec2f9349;p=thirdparty%2Fsamba.git gsskrb5: just don't force, but allow the flags when GSS_CF_NO_CI_FLAGS is given metze --- 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;