diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-06-27 11:34:05 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-06-27 12:43:04 +0200 |
| commit | 3678411037329d8bebcaadcea6676018e0131afb (patch) | |
| tree | 4058af9b9c812352291ecddcc59b0d3328d06629 /source4 | |
| parent | eb192abd3a6891b0b5e9e420d296a97247947488 (diff) | |
| download | samba-3678411037329d8bebcaadcea6676018e0131afb.tar.gz samba-3678411037329d8bebcaadcea6676018e0131afb.tar.bz2 samba-3678411037329d8bebcaadcea6676018e0131afb.zip | |
gsskrb5: just don't force, but allow the flags when GSS_CF_NO_CI_FLAGS is given
metze
(This used to be commit f10c9ca3612d7bdc4c2c221e959f8c48ec2f9349)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/heimdal/lib/gssapi/krb5/init_sec_context.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source4/heimdal/lib/gssapi/krb5/init_sec_context.c b/source4/heimdal/lib/gssapi/krb5/init_sec_context.c index ab7624eef0..c455a5dc8b 100644 --- a/source4/heimdal/lib/gssapi/krb5/init_sec_context.c +++ b/source4/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; |