From: Tom Yu <tlyu@mit.edu>
Date: Thu, 14 May 2009 21:04:57 +0000 (+0000)
Subject: Add IOV_SHIM_EXERCISE_WRAP and IOV_SHIM_EXERCISE_UNWRAP conditionals
X-Git-Tag: krb5-1.8-alpha1~474
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48f6c541c2b8084edf10aae4104025aef6717dce;p=krb5.git

Add IOV_SHIM_EXERCISE_WRAP and IOV_SHIM_EXERCISE_UNWRAP conditionals
to allow finer-grained testing.

ticket: 6487
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22352 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c
index 6e1d61869..a20e59dfb 100644
--- a/src/lib/gssapi/krb5/gssapi_krb5.c
+++ b/src/lib/gssapi/krb5/gssapi_krb5.c
@@ -640,11 +640,14 @@ static struct gss_config krb5_mechanism = {
     krb5_gss_context_time,
     krb5_gss_get_mic,
     krb5_gss_verify_mic,
-#ifdef IOV_SHIM_EXERCISE
-    NULL,
+#if defined(IOV_SHIM_EXERCISE_WRAP) || defined(IOV_SHIM_EXERCISE)
     NULL,
 #else
     krb5_gss_wrap,
+#endif
+#if defined(IOV_SHIM_EXERCISE_UNWRAP) || defined(IOV_SHIM_EXERCISE)
+    NULL,
+#else
     krb5_gss_unwrap,
 #endif
     krb5_gss_display_status,