* winccld.c: Include k5-int.h to get hidden ops struct.

	[pullup from 1-2-2-branch]

2002-06-20  Alexandra Ellwood <lxs@mit.edu>

	* stdcc.h: Added prototype for krb5_stdcc_shutdown.

	* stdcc.h, stdcc_util.h, stdcc_util.c: Updated Mac OS X headers to new
	framework layout

	* stdcc.c: Removed unused variables and fixed macros to reduce warnings

	[pullups from 1-2-2-branch]

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

6 files changed, 36 insertions, 8 deletions

diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog
index 4630d4c583..b3e010c5be 100644
--- a/src/lib/krb5/ccache/ccapi/ChangeLog
+++ b/src/lib/krb5/ccache/ccapi/ChangeLog
@@ -1,3 +1,26 @@
+2002-06-20  Danilo Almeida  <dalmeida@mit.edu>
+
+	* winccld.c: Include k5-int.h to get hidden ops struct.
+	[pullup from 1-2-2-branch]
+
+2002-06-20  Alexandra Ellwood <lxs@mit.edu>
+
+	* stdcc.h: Added prototype for krb5_stdcc_shutdown.
+
+	* stdcc.h, stdcc_util.h, stdcc_util.c: Updated Mac OS X headers to new 
+	framework layout
+
+	* stdcc.c: Removed unused variables and fixed macros to reduce warnings
+
+	[pullups from 1-2-2-branch]
+
+2002-06-20  Miro Jurisic  <meeroh@mit.edu>
+
+	* stdcc.c: Replaced cc_* macros with functions
+	* stdcc.h, stdcc_util.h: Updated Mac OS #defines and #includes for new 
+	header layout and Mac OS X frameworks
+	[pullup from 1-2-2-branch]
+
 2002-04-01  Danilo Almeida  <dalmeida@mit.edu>
 
 	* stdcc_util.c: Include errno.h.
diff --git a/src/lib/krb5/ccache/ccapi/stdcc.c b/src/lib/krb5/ccache/ccapi/stdcc.c
index 9899cb706e..6bad56a3d5 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc.c
+++ b/src/lib/krb5/ccache/ccapi/stdcc.c
@@ -32,6 +32,7 @@
 #include "stdcc.h"
 #include "stdcc_util.h"
 #include "string.h"
+#include "k5-int.h"
 #include <stdio.h>
 
 apiCB *gCntrlBlock = NULL;
@@ -264,7 +265,7 @@ krb5_error_code KRB5_CALLCONV  krb5_stdcc_resolve
 	stdccCacheDataPtr	ccapi_data = NULL;
 	int 			err;
 	krb5_error_code		retval;
-	char 			*cName;
+	char 			*cName = NULL;
 	
 	if ((retval = stdcc_setup(context, NULL)))
 		return retval;
@@ -548,7 +549,9 @@ krb5_error_code KRB5_CALLCONV krb5_stdcc_end_seq_get
 	krb5_error_code		retval;
 	stdccCacheDataPtr	ccapi_data = NULL;
 	int			err;
+#ifndef CC_API_VER2
 	cred_union 		*credU = NULL;
+#endif
 
 	ccapi_data = id->data;
 	
@@ -656,7 +659,6 @@ krb5_stdcc_destroy (krb5_context context, krb5_ccache id)
 const char * KRB5_CALLCONV krb5_stdcc_get_name 
         (krb5_context context, krb5_ccache id )
 {
-	char *name = NULL;
 	stdccCacheDataPtr	ccapi_data = id->data;
 
 	if (!ccapi_data)
diff --git a/src/lib/krb5/ccache/ccapi/stdcc.h b/src/lib/krb5/ccache/ccapi/stdcc.h
index 705cdf5f2e..e67c4e94f9 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc.h
+++ b/src/lib/krb5/ccache/ccapi/stdcc.h
@@ -1,8 +1,8 @@
 #include "krb5.h"
 #include "k5-int.h"
 	
-#if defined(macintosh)
-#include "CCache2.h"
+#if TARGET_OS_MAC
+#include <Kerberos/CredentialsCache2.h>
 #endif
 
 #if defined(_WIN32)
@@ -25,6 +25,8 @@ typedef struct _stdccCacheData {
 
 /* function protoypes  */
 
+void krb5_stdcc_shutdown(void);
+
 krb5_error_code KRB5_CALLCONV krb5_stdcc_close
         (krb5_context, krb5_ccache id );
 
diff --git a/src/lib/krb5/ccache/ccapi/stdcc_util.c b/src/lib/krb5/ccache/ccapi/stdcc_util.c
index c0e1b5b7ef..3f9c052715 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc_util.c
+++ b/src/lib/krb5/ccache/ccapi/stdcc_util.c
@@ -215,7 +215,7 @@ void dupCCtoK5(krb5_context context, cc_creds *src, krb5_creds *dest)
     memcpy(dest->keyblock.contents, src->keyblock.data, dest->keyblock.length);
 
     /* copy times */
-#ifdef macintosh
+#if TARGET_OS_MAC
     err = krb5_get_time_offsets(context, &offset_seconds, &offset_microseconds);
     if (err) return;
 #endif
@@ -310,7 +310,7 @@ void dupK5toCC(krb5_context context, krb5_creds *creds, cred_union **cu)
 	c->keyblock.data = NULL;
     }
 
-#ifdef macintosh
+#if TARGET_OS_MAC
     err = krb5_get_time_offsets(context, &offset_seconds, &offset_microseconds);
     if (err) return;
 #endif
diff --git a/src/lib/krb5/ccache/ccapi/stdcc_util.h b/src/lib/krb5/ccache/ccapi/stdcc_util.h
index 30d9cafd46..d70394fbe5 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc_util.h
+++ b/src/lib/krb5/ccache/ccapi/stdcc_util.h
@@ -3,8 +3,8 @@
  * Frank Dabek, July 1998
  */
 
-#if defined(macintosh)
-#include "CCache2.h"
+#if TARGET_OS_MAC
+#include <Kerberos/CredentialsCache2.h>
 #endif
 
 #if defined(_WIN32)
diff --git a/src/lib/krb5/ccache/ccapi/winccld.c b/src/lib/krb5/ccache/ccapi/winccld.c
index 39d8f12278..1ff75db488 100644
--- a/src/lib/krb5/ccache/ccapi/winccld.c
+++ b/src/lib/krb5/ccache/ccapi/winccld.c
@@ -7,6 +7,7 @@
 #include <windows.h>
 #include <stdio.h>
 #include "stdcc.h"
+#include "k5-int.h"
 
 /* from fcc-proto.h */
 extern krb5_cc_ops krb5_fcc_ops;