From f0a6df2a4155034808e310a33c2994ff9e0dbca2 Mon Sep 17 00:00:00 2001
From: Alexandra Ellwood <lxs@mit.edu>
Date: Fri, 15 Aug 2008 22:19:01 +0000
Subject: [PATCH] Conditionalize building of CCAPI ccache type on USE_CCAPI

Still refer to Windows by OS macro because KfW builds do not set
USE_CCAPI.

ticket: new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20664 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/lib/krb5/ccache/ccapi/stdcc.c      |  7 ++++++-
 src/lib/krb5/ccache/ccapi/stdcc.h      | 13 +++++++------
 src/lib/krb5/ccache/ccapi/stdcc_util.c |  6 ++++--
 src/lib/krb5/ccache/ccapi/stdcc_util.h |  9 +++++----
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/lib/krb5/ccache/ccapi/stdcc.c b/src/lib/krb5/ccache/ccapi/stdcc.c
index 8f98ef7db..83d6176cc 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc.c
+++ b/src/lib/krb5/ccache/ccapi/stdcc.c
@@ -29,6 +29,8 @@
  * 
  */
 
+#if defined(_WIN32) || defined(USE_CCAPI)
+
 #include "k5-int.h"
 #include "stdcc.h"
 #include "stdcc_util.h"
@@ -1586,7 +1588,7 @@ krb5_error_code KRB5_CALLCONV krb5_stdcc_remove
     	int err;
 	stdccCacheDataPtr	ccapi_data = id->data;
 	krb5_error_code		retval;
-	
+        
 	if ((retval = stdcc_setup(context, ccapi_data))) {
 		if (retval == KRB5_FCC_NOFILE)
 			return 0;
@@ -1611,3 +1613,6 @@ krb5_error_code KRB5_CALLCONV krb5_stdcc_remove
         return 0;
 }
 #endif /* !USE_CCAPI_V3 */
+
+#endif /* defined(_WIN32) || defined(USE_CCAPI) */
+
diff --git a/src/lib/krb5/ccache/ccapi/stdcc.h b/src/lib/krb5/ccache/ccapi/stdcc.h
index 4fe602799..dcd8b6b6c 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc.h
+++ b/src/lib/krb5/ccache/ccapi/stdcc.h
@@ -1,18 +1,17 @@
+#if defined(_WIN32) || defined(USE_CCAPI)
+
 #include "k5-int.h"	/* loads krb5.h */
-	
+
 #ifdef USE_CCAPI_V3
 #include <CredentialsCache.h>
 #else
-#ifdef USE_CCAPI
-#include <CredentialsCache2.h>
-#else
 #if defined(_WIN32)
 #include "cacheapi.h"
-#endif
+#else
+#include <CredentialsCache2.h>
 #endif
 #endif
 
-
 #define kStringLiteralLen 255
 
 /* globals to be exported */
@@ -153,3 +152,5 @@ krb5_error_code KRB5_CALLCONV krb5_stdcc_get_flags
 krb5_error_code KRB5_CALLCONV krb5_stdcc_remove 
         (krb5_context, krb5_ccache id , krb5_flags flags, krb5_creds *creds);
 #endif
+
+#endif /* defined(_WIN32) || defined(USE_CCAPI) */
diff --git a/src/lib/krb5/ccache/ccapi/stdcc_util.c b/src/lib/krb5/ccache/ccapi/stdcc_util.c
index 58e72b33a..a9d1f43d0 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc_util.c
+++ b/src/lib/krb5/ccache/ccapi/stdcc_util.c
@@ -5,6 +5,8 @@
  * Frank Dabek, July 1998
  */
 
+#if defined(_WIN32) || defined(USE_CCAPI)
+
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
@@ -1034,7 +1036,7 @@ int stdccCredsMatch(krb5_context context, krb5_creds *base,
     if (((MATCH_SET(KRB5_TC_MATCH_SRV_NAMEONLY) &&
 	  srvname_match(context, match, base)) ||
 	 standard_fields_match(context, match, base))
-	&&
+        &&
 	(! MATCH_SET(KRB5_TC_MATCH_IS_SKEY) ||
 	 match->is_skey == base->is_skey)
 	&&
@@ -1063,4 +1065,4 @@ int stdccCredsMatch(krb5_context context, krb5_creds *base,
     return FALSE;
 }
 
-
+#endif /* defined(_WIN32) || defined(USE_CCAPI) */
diff --git a/src/lib/krb5/ccache/ccapi/stdcc_util.h b/src/lib/krb5/ccache/ccapi/stdcc_util.h
index c3a5e39cc..2b724eb78 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc_util.h
+++ b/src/lib/krb5/ccache/ccapi/stdcc_util.h
@@ -3,17 +3,17 @@
  * Frank Dabek, July 1998
  */
 
+#if defined(_WIN32) || defined(USE_CCAPI)
+
 #include "autoconf.h"
 
 #if USE_CCAPI_V3
 #include <CredentialsCache.h>
 #else
-#if USE_CCAPI
-#include <CredentialsCache2.h>
-#endif
-
 #if defined(_WIN32)
 #include "cacheapi.h"
+#else
+#include <CredentialsCache2.h>
 #endif
 #endif
 
@@ -45,3 +45,4 @@ int bitTst(int var, int mask);
 #define kAddressArray 4 
 #define kAuthDataArray 5
 
+#endif /* defined(_WIN32) || defined(USE_CCAPI) */
-- 
2.26.2