* Makefile.in: Build cc accessor functions on Windows

	* ccdefault.c: updated to new KLL function name

	* ccdefault.c: swapped include of KerberosLoginPrivate with
	k5-int.h to avoid problems with including CoreServices.h after
	profile.h and krb.h

	* ccdefault.c: Updated Mac OS X headers to new framework layout

	* ccdefops.c: created #define for USE_CCAPI now that both Mac OS 9
	and Mac OS 10 use ccapi.

	[pullups from 1-2-2-branch]

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

diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 21e9b7b70c34a0702e6474bf22fc714a436c0322..6a9d054e9f8b535f82e035919e5c036f7a114ffe 100644 (file)
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,23 @@
+2002-60-20  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Build cc accessor functions on Windows.
+       [pullup from 1-2-2-branch]
+
+2002-06-20 Alexandra Ellwood <lxs@mit.edu>
+
+       * ccdefault.c: updated to new KLL function name
+
+       * ccdefault.c: swapped include of KerberosLoginPrivate with
+       k5-int.h to avoid problems with including CoreServices.h after
+       profile.h and krb.h
+
+       * ccdefault.c: Updated Mac OS X headers to new framework layout
+
+       * ccdefops.c: created #define for USE_CCAPI now that both Mac OS 9
+       and Mac OS 10 use ccapi.
+
+       [pullups from 1-2-2-branch]
+
 2002-04-10  Danilo Almeida  <dalmeida@mit.edu>
 
        * cc_file.c: Use _WIN32 instead of _WINSOCKAPI_ because

diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index f81d4250f0204c4ea0da8815b04dc4416f824240..4812a48c839cf17f8c2d727113c2bd095dbc7282 100644 (file)
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -51,6 +51,8 @@ SRCS= $(srcdir)/ccbase.c \
        $(srcdir)/ccfns.c \
        $(srcdir)/ser_cc.c
 
+##DOS##OBJS=$(OBJS) $(OUTPRE)ccfns.$(OBJEXT)
+
 all-unix:: all-libobjs
 
 all-windows:: subdirs $(OBJFILE) 

diff --git a/src/lib/krb5/ccache/ccdefault.c b/src/lib/krb5/ccache/ccdefault.c
index 7fde85286de9a999890f635eea7a6636b5c91a82..fcdfb769e776a3a7743aa61ad29f73a4d70977ac 100644 (file)
--- a/src/lib/krb5/ccache/ccdefault.c
+++ b/src/lib/krb5/ccache/ccdefault.c
@@ -27,12 +27,12 @@
  * Find default credential cache
  */
 
-#include "k5-int.h"
-
 #ifdef USE_LOGIN_LIBRARY
-#include <KerberosLoginInternal.h>
+#include <Kerberos/KerberosLoginPrivate.h>
 #endif
 
+#include "k5-int.h"
+
 krb5_error_code KRB5_CALLCONV
 krb5_cc_default(context, ccache)
    krb5_context context;
@@ -98,7 +98,8 @@ krb5int_cc_default(context, ccache)
                }
                
                /* Try to make sure a krb5 tgt is in the cache */
-               err = __KLInternalAcquireTicketsForCache (desiredPrincipal, krb5_cc_default_name(context), 
+               err = __KLInternalAcquireInitialTicketsForCache (desiredPrincipal, NULL, 
+                                                    krb5_cc_default_name (context), 
                                                                                                        kerberosVersion_V5, nil, &outCacheName);
                if (err == klNoErr) {
                        /* This function tries to get tickets and put them in the specified 

diff --git a/src/lib/krb5/ccache/ccdefops.c b/src/lib/krb5/ccache/ccdefops.c
index 2651273bec8ee3b49d5ac556959a71a1419ed670..092503e9983f531802dce59b00e31f76095ba4f2 100644 (file)
--- a/src/lib/krb5/ccache/ccdefops.c
+++ b/src/lib/krb5/ccache/ccdefops.c
@@ -30,7 +30,7 @@
 
 #include "k5-int.h"
 
-#if defined(macintosh) 
+#if defined(USE_CCAPI)
 
 /*
  * Macs use the shared, memory based credentials cache