From aad8c2b04da237d510c2f7d14cda239fc43bafc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Fri, 27 Jun 2008 12:01:23 +0000
Subject: [PATCH] krb5: just don't force, but allow the flags when
 GSS_CF_NO_CI_FLAGS is given From Stefan Metzmacher

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23330 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/gssapi/krb5/init_sec_context.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/gssapi/krb5/init_sec_context.c b/lib/gssapi/krb5/init_sec_context.c
index dd8c72530..e21568fd8 100644
--- a/lib/gssapi/krb5/init_sec_context.c
+++ b/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;