From 82e2a6b9a6c0518436775989d49b8f1b3dbbf043 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Thu, 20 Jun 2002 23:02:31 +0000 Subject: [PATCH] * 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 --- src/lib/krb5/ccache/ChangeLog | 20 ++++++++++++++++++++ src/lib/krb5/ccache/Makefile.in | 2 ++ src/lib/krb5/ccache/ccdefault.c | 9 +++++---- src/lib/krb5/ccache/ccdefops.c | 2 +- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 21e9b7b70..6a9d054e9 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,23 @@ +2002-60-20 Danilo Almeida + + * Makefile.in: Build cc accessor functions on Windows. + [pullup from 1-2-2-branch] + +2002-06-20 Alexandra Ellwood + + * 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 * 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 f81d4250f..4812a48c8 100644 --- 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 7fde85286..fcdfb769e 100644 --- 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 +#include #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 2651273be..092503e99 100644 --- 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 -- 2.26.2