From: Luke Howard <lukeh@padl.com>
Date: Thu, 23 Sep 2010 15:32:21 +0000 (+0200)
Subject: Pass GSS_C_DCE_STYLE to wrap/unwrap
X-Git-Tag: vm/20110310~233^2~4
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.orig;a=commitdiff_plain;h=4af65190a8d5a03d0a68ea42c84cf3d910534d2c

Pass GSS_C_DCE_STYLE to wrap/unwrap
---

diff --git a/accept_sec_context.c b/accept_sec_context.c
index eb1a07c..a65d7a9 100644
--- a/accept_sec_context.c
+++ b/accept_sec_context.c
@@ -500,7 +500,7 @@ eapGssSmAcceptGssReauth(OM_uint32 *minor,
                                krbInitiator, mech, timeRec);
     }
 
-    ctx->gssFlags = gssFlags & ~(GSS_C_DCE_STYLE);
+    ctx->gssFlags = gssFlags;
 
     gssReleaseName(&tmpMinor, &krbInitiator);
 
diff --git a/unwrap_iov.c b/unwrap_iov.c
index ee2790d..7e6eb87 100644
--- a/unwrap_iov.c
+++ b/unwrap_iov.c
@@ -293,7 +293,7 @@ unwrapStream(OM_uint32 *minor,
 
     assert(toktype == TOK_TYPE_WRAP);
 
-    if (toktype != TOK_TYPE_WRAP || (ctx->gssFlags & GSS_C_DCE_STYLE)) {
+    if (toktype != TOK_TYPE_WRAP) {
         code = EINVAL;
         goto cleanup;
     }
diff --git a/util_reauth.c b/util_reauth.c
index b4407b7..7b16c0d 100644
--- a/util_reauth.c
+++ b/util_reauth.c
@@ -793,4 +793,3 @@ cleanup:
 
     return major;
 }
-