diff --git a/lib/gssapi/krb5/init_sec_context.c b/lib/gssapi/krb5/init_sec_context.c
index 8d0ce24c5..425fd896f 100644
--- a/lib/gssapi/krb5/init_sec_context.c
+++ b/lib/gssapi/krb5/init_sec_context.c
@@ -476,8 +476,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)