From: Luke Howard <lukeh@padl.com>
Date: Sun, 26 Sep 2010 15:31:28 +0000 (+0200)
Subject: cleanup
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=cyrus-sasl.git;a=commitdiff_plain;h=a9a492a18d255179bf16a27e61c3923befcc5a64

cleanup
---

diff --git a/plugins/gs2_token.c b/plugins/gs2_token.c
index 380ac6c..9a97243 100644
--- a/plugins/gs2_token.c
+++ b/plugins/gs2_token.c
@@ -164,7 +164,7 @@ gs2_make_token_header(
 
 OM_uint32
 gs2_verify_token_header(OM_uint32 *minor,
-                        gss_OID mech,
+                        gss_const_OID mech,
                         size_t *body_size,
                         unsigned char **buf_in,
                         size_t toksize_in)
@@ -206,13 +206,8 @@ gs2_verify_token_header(OM_uint32 *minor,
     toid.elements = buf;
     buf += toid.length;
 
-    if (mech->elements == NULL) {
-        *mech = toid;
-        if (toid.length == 0)
-            return GSS_S_BAD_MECH;
-    } else if (!g_OID_equal(&toid, mech)) {
+    if (!g_OID_equal(&toid, mech))
         return GSS_S_BAD_MECH;
-    }
 
     *buf_in = buf;
     *body_size = toksize;
diff --git a/plugins/gs2_token.h b/plugins/gs2_token.h
index 35c2459..7d74f9e 100644
--- a/plugins/gs2_token.h
+++ b/plugins/gs2_token.h
@@ -29,7 +29,7 @@
 
 extern OM_uint32
 gs2_verify_token_header(OM_uint32 *minor,
-                        gss_OID mech,
+                        gss_const_OID mech,
                         size_t *body_size,
                         unsigned char **buf_in,
                         size_t toksize_in);