Some fixups and stubs for building ccapi on UNIX, and dependencies.

(Doesn't make a complete working implementation, but it mostly compiles.)

Does *not* include the changes to actually cause the ccapi code to get
built in normal UNIX builds.

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

diff --git a/src/ccapi/Makefile.in b/src/ccapi/Makefile.in
index 78e2a47fd3d7fd7f2eada7d8860990d5e083f2cf..85e81f6ba2bf9c70359a79e5444cfca9521f5301 100644 (file)
--- a/src/ccapi/Makefile.in
+++ b/src/ccapi/Makefile.in
@@ -7,7 +7,6 @@ SUBDIRS= lib server test
 
 all-windows:: 
        @echo Making in ccapi\lib\win
-    @echo buildtop: $(BUILDTOP)
        cd lib\win
        cd
        $(MAKE) -$(MFLAGS)
@@ -34,4 +33,3 @@ clean-windows::
        cd
        $(MAKE) -$(MFLAGS) clean
 
-# +++ Dependency line eater +++

diff --git a/src/ccapi/deps b/src/ccapi/deps
new file mode 100644 (file)
index 0000000..2feac3c
--- /dev/null
+++ b/src/ccapi/deps
@@ -0,0 +1 @@
+# No dependencies here.

diff --git a/src/ccapi/lib/Makefile.in b/src/ccapi/lib/Makefile.in
index 76df8126f26daeb2d4e5e5fa813741cc6b8f5f83..89cec5ba9fa15316cb677d38f7b053424a6cb8cb 100644 (file)
--- a/src/ccapi/lib/Makefile.in
+++ b/src/ccapi/lib/Makefile.in
@@ -3,10 +3,11 @@ myfulldir=ccapi/lib
 mydir=ccapi/lib
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS=unix
-LOCALINCLUDES=-I$(srcdir)/../common
+LOCALINCLUDES=-I$(srcdir)/../common -I.
 
-SHLIB_EXPDEPS= $(COM_ERR_DEPLIB)
-SHLIB_EXPLIBS=-lcom_err
+SHLIB_EXPDEPS= $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
+SHLIB_EXPLIBS=-lcom_err $(SUPPORT_LIB)
+RELDIR=../ccapi/lib
 
 LIBBASE=krb5-ccapi
 LIBMAJOR=1
@@ -14,9 +15,7 @@ LIBMINOR=0
 
 STOBJLISTS= \
        OBJS.ST \
-       unix/OBJS.ST \
-       ../common/OBJS.ST \
-       ../common/unix/OBJS.ST
+       unix/OBJS.ST
 
 STLIBOBJS= \
        ccapi_ccache.o \
@@ -62,4 +61,3 @@ clean-unix:: clean-libobjs clean-liblinks clean-libs
 @lib_frag@
 @libobj_frag@
 
-# +++ Dependency line eater +++

diff --git a/src/ccapi/lib/deps b/src/ccapi/lib/deps
new file mode 100644 (file)
index 0000000..70c5269
--- /dev/null
+++ b/src/ccapi/lib/deps
@@ -0,0 +1,86 @@
+# 
+# Generated makefile dependencies follow.
+#
+ccapi_ccache.so ccapi_ccache.po $(OUTPRE)ccapi_ccache.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_ccache.c ccapi_ccache.h ccapi_credentials.h ccapi_credentials_iterator.h \
+  ccapi_ipc.h ccapi_string.h
+ccapi_ccache_iterator.so ccapi_ccache_iterator.po $(OUTPRE)ccapi_ccache_iterator.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_ccache.h ccapi_ccache_iterator.c ccapi_ccache_iterator.h \
+  ccapi_ipc.h
+ccapi_context.so ccapi_context.po $(OUTPRE)ccapi_context.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_ccache.h ccapi_ccache_iterator.h ccapi_context.c \
+  ccapi_context.h ccapi_context_change_time.h ccapi_err.h \
+  ccapi_ipc.h ccapi_string.h
+ccapi_context_change_time.so ccapi_context_change_time.po \
+  $(OUTPRE)ccapi_context_change_time.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_context_change_time.c ccapi_context_change_time.h
+ccapi_credentials.so ccapi_credentials.po $(OUTPRE)ccapi_credentials.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_credentials.c ccapi_credentials.h ccapi_string.h
+ccapi_credentials_iterator.so ccapi_credentials_iterator.po \
+  $(OUTPRE)ccapi_credentials_iterator.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_credentials.h ccapi_credentials_iterator.c ccapi_credentials_iterator.h \
+  ccapi_ipc.h
+ccapi_err.so ccapi_err.po $(OUTPRE)ccapi_err.$(OBJEXT): \
+  $(COM_ERR_DEPS) ccapi_err.c
+ccapi_ipc.so ccapi_ipc.po $(OUTPRE)ccapi_ipc.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_ipc.c ccapi_ipc.h ccapi_os_ipc.h
+ccapi_string.so ccapi_string.po $(OUTPRE)ccapi_string.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_string.c ccapi_string.h
+ccapi_v2.so ccapi_v2.po $(OUTPRE)ccapi_v2.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_ccache.h ccapi_ccache_iterator.h ccapi_context.h \
+  ccapi_credentials.h ccapi_credentials_iterator.h ccapi_string.h \
+  ccapi_v2.c

diff --git a/src/ccapi/lib/libkrb5-ccapi.exports b/src/ccapi/lib/libkrb5-ccapi.exports
new file mode 100644 (file)
index 0000000..1a8560f
--- /dev/null
+++ b/src/ccapi/lib/libkrb5-ccapi.exports
@@ -0,0 +1 @@
+cc_close

diff --git a/src/ccapi/lib/unix/Makefile.in b/src/ccapi/lib/unix/Makefile.in
index 2651fad39ee7f661d2994a8a9df06de5e386902a..383159f2fb04b5fad4174599f212d8c762689c0e 100644 (file)
--- a/src/ccapi/lib/unix/Makefile.in
+++ b/src/ccapi/lib/unix/Makefile.in
@@ -2,10 +2,13 @@ thisconfigdir=../../..
 myfulldir=ccapi/lib/unix
 mydir=ccapi/lib/unix
 BUILDTOP=$(REL)..$(S)..$(S)..
+LOCALINCLUDES= -I$(srcdir)/.. -I$(srcdir)/../../common
+
+STLIBOBJS= stubs.o
+OBJS= $(OUTPRE)stubs.$(OBJEXT)
 
 all-unix:: all-libobjs
 clean-unix:: clean-libobjs
 
 @libobj_frag@
 
-# +++ Dependency line eater +++

diff --git a/src/ccapi/lib/unix/deps b/src/ccapi/lib/unix/deps
new file mode 100644 (file)
index 0000000..2feac3c
--- /dev/null
+++ b/src/ccapi/lib/unix/deps
@@ -0,0 +1 @@
+# No dependencies here.

diff --git a/src/ccapi/lib/unix/stubs.c b/src/ccapi/lib/unix/stubs.c
new file mode 100644 (file)
index 0000000..3afd8f1
--- /dev/null
+++ b/src/ccapi/lib/unix/stubs.c
@@ -0,0 +1,10 @@
+#include <errno.h>
+#include "ccapi_os_ipc.h"
+
+cc_int32 cci_os_ipc_thread_init (void)
+{
+    return EINVAL;
+}
+void cci_os_ipc_thread_fini (void)
+{
+}

diff --git a/src/ccapi/server/Makefile.in b/src/ccapi/server/Makefile.in
index d7d9a4d1ed4e36ce9daba4980790af401e0aa4ed..17c79593fd91e42b9fc7d924e0410099e6105d43 100644 (file)
--- a/src/ccapi/server/Makefile.in
+++ b/src/ccapi/server/Makefile.in
@@ -59,4 +59,3 @@ clean-unix:: clean-libobjs
 
 @libobj_frag@
 
-# +++ Dependency line eater +++

diff --git a/src/ccapi/server/deps b/src/ccapi/server/deps
new file mode 100644 (file)
index 0000000..29d4244
--- /dev/null
+++ b/src/ccapi/server/deps
@@ -0,0 +1,170 @@
+# 
+# Generated makefile dependencies follow.
+#
+ccs_array.so ccs_array.po $(OUTPRE)ccs_array.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_array_internal.h $(srcdir)/../common/cci_common.h \
+  $(srcdir)/../common/cci_cred_union.h $(srcdir)/../common/cci_debugging.h \
+  $(srcdir)/../common/cci_identifier.h $(srcdir)/../common/cci_message.h \
+  $(srcdir)/../common/cci_types.h ccs_array.c ccs_array.h \
+  ccs_cache_collection.h ccs_callback.h ccs_ccache.h \
+  ccs_ccache_iterator.h ccs_client.h ccs_common.h ccs_credentials.h \
+  ccs_credentials_iterator.h ccs_list.h ccs_lock.h ccs_lock_state.h \
+  ccs_pipe.h ccs_server.h ccs_types.h
+ccs_cache_collection.so ccs_cache_collection.po $(OUTPRE)ccs_cache_collection.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccs_array.h ccs_cache_collection.c ccs_cache_collection.h \
+  ccs_callback.h ccs_ccache.h ccs_ccache_iterator.h ccs_client.h \
+  ccs_common.h ccs_credentials.h ccs_credentials_iterator.h \
+  ccs_list.h ccs_lock.h ccs_lock_state.h ccs_os_notify.h \
+  ccs_pipe.h ccs_server.h ccs_types.h
+ccs_callback.so ccs_callback.po $(OUTPRE)ccs_callback.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccs_array.h ccs_cache_collection.h ccs_callback.c ccs_callback.h \
+  ccs_ccache.h ccs_ccache_iterator.h ccs_client.h ccs_common.h \
+  ccs_credentials.h ccs_credentials_iterator.h ccs_list.h \
+  ccs_lock.h ccs_lock_state.h ccs_pipe.h ccs_server.h \
+  ccs_types.h
+ccs_ccache.so ccs_ccache.po $(OUTPRE)ccs_ccache.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccs_array.h ccs_cache_collection.h ccs_callback.h ccs_ccache.c \
+  ccs_ccache.h ccs_ccache_iterator.h ccs_client.h ccs_common.h \
+  ccs_credentials.h ccs_credentials_iterator.h ccs_list.h \
+  ccs_lock.h ccs_lock_state.h ccs_os_notify.h ccs_pipe.h \
+  ccs_server.h ccs_types.h
+ccs_ccache_iterator.so ccs_ccache_iterator.po $(OUTPRE)ccs_ccache_iterator.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccs_array.h ccs_cache_collection.h ccs_callback.h ccs_ccache.h \
+  ccs_ccache_iterator.c ccs_ccache_iterator.h ccs_client.h \
+  ccs_common.h ccs_credentials.h ccs_credentials_iterator.h \
+  ccs_list.h ccs_lock.h ccs_lock_state.h ccs_pipe.h ccs_server.h \
+  ccs_types.h
+ccs_client.so ccs_client.po $(OUTPRE)ccs_client.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccs_array.h ccs_cache_collection.h ccs_callback.h ccs_ccache.h \
+  ccs_ccache_iterator.h ccs_client.c ccs_client.h ccs_common.h \
+  ccs_credentials.h ccs_credentials_iterator.h ccs_list.h \
+  ccs_lock.h ccs_lock_state.h ccs_pipe.h ccs_server.h \
+  ccs_types.h
+ccs_credentials.so ccs_credentials.po $(OUTPRE)ccs_credentials.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccs_array.h ccs_cache_collection.h ccs_callback.h ccs_ccache.h \
+  ccs_ccache_iterator.h ccs_client.h ccs_common.h ccs_credentials.c \
+  ccs_credentials.h ccs_credentials_iterator.h ccs_list.h \
+  ccs_lock.h ccs_lock_state.h ccs_pipe.h ccs_server.h \
+  ccs_types.h
+ccs_credentials_iterator.so ccs_credentials_iterator.po \
+  $(OUTPRE)ccs_credentials_iterator.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccs_array.h ccs_cache_collection.h ccs_callback.h ccs_ccache.h \
+  ccs_ccache_iterator.h ccs_client.h ccs_common.h ccs_credentials.h \
+  ccs_credentials_iterator.c ccs_credentials_iterator.h \
+  ccs_list.h ccs_lock.h ccs_lock_state.h ccs_pipe.h ccs_server.h \
+  ccs_types.h
+ccs_list.so ccs_list.po $(OUTPRE)ccs_list.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_array_internal.h $(srcdir)/../common/cci_common.h \
+  $(srcdir)/../common/cci_cred_union.h $(srcdir)/../common/cci_debugging.h \
+  $(srcdir)/../common/cci_identifier.h $(srcdir)/../common/cci_message.h \
+  $(srcdir)/../common/cci_types.h ccs_array.h ccs_cache_collection.h \
+  ccs_callback.h ccs_ccache.h ccs_ccache_iterator.h ccs_client.h \
+  ccs_common.h ccs_credentials.h ccs_credentials_iterator.h \
+  ccs_list.c ccs_list.h ccs_list_internal.h ccs_lock.h \
+  ccs_lock_state.h ccs_pipe.h ccs_server.h ccs_types.h
+ccs_list_internal.so ccs_list_internal.po $(OUTPRE)ccs_list_internal.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_array_internal.h $(srcdir)/../common/cci_common.h \
+  $(srcdir)/../common/cci_cred_union.h $(srcdir)/../common/cci_debugging.h \
+  $(srcdir)/../common/cci_identifier.h $(srcdir)/../common/cci_message.h \
+  $(srcdir)/../common/cci_types.h ccs_array.h ccs_cache_collection.h \
+  ccs_callback.h ccs_ccache.h ccs_ccache_iterator.h ccs_client.h \
+  ccs_common.h ccs_credentials.h ccs_credentials_iterator.h \
+  ccs_list.h ccs_list_internal.c ccs_list_internal.h \
+  ccs_lock.h ccs_lock_state.h ccs_pipe.h ccs_server.h \
+  ccs_types.h
+ccs_lock.so ccs_lock.po $(OUTPRE)ccs_lock.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccs_array.h ccs_cache_collection.h ccs_callback.h ccs_ccache.h \
+  ccs_ccache_iterator.h ccs_client.h ccs_common.h ccs_credentials.h \
+  ccs_credentials_iterator.h ccs_list.h ccs_lock.c ccs_lock.h \
+  ccs_lock_state.h ccs_pipe.h ccs_server.h ccs_types.h
+ccs_lock_state.so ccs_lock_state.po $(OUTPRE)ccs_lock_state.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccs_array.h ccs_cache_collection.h ccs_callback.h ccs_ccache.h \
+  ccs_ccache_iterator.h ccs_client.h ccs_common.h ccs_credentials.h \
+  ccs_credentials_iterator.h ccs_list.h ccs_lock.h ccs_lock_state.c \
+  ccs_lock_state.h ccs_pipe.h ccs_server.h ccs_types.h
+ccs_pipe.so ccs_pipe.po $(OUTPRE)ccs_pipe.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccs_array.h ccs_cache_collection.h ccs_callback.h ccs_ccache.h \
+  ccs_ccache_iterator.h ccs_client.h ccs_common.h ccs_credentials.h \
+  ccs_credentials_iterator.h ccs_list.h ccs_lock.h ccs_lock_state.h \
+  ccs_os_pipe.h ccs_pipe.c ccs_pipe.h ccs_server.h ccs_types.h
+ccs_server.so ccs_server.po $(OUTPRE)ccs_server.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccs_array.h ccs_cache_collection.h ccs_callback.h ccs_ccache.h \
+  ccs_ccache_iterator.h ccs_client.h ccs_common.h ccs_credentials.h \
+  ccs_credentials_iterator.h ccs_list.h ccs_lock.h ccs_lock_state.h \
+  ccs_os_server.h ccs_pipe.h ccs_server.c ccs_server.h \
+  ccs_types.h

diff --git a/src/ccapi/server/unix/Makefile.in b/src/ccapi/server/unix/Makefile.in
index 09b199cae51b98c7230dccfb521081a173677aa8..9f0ae7485fa089ddb9e5406a74a677fd7989fa35 100644 (file)
--- a/src/ccapi/server/unix/Makefile.in
+++ b/src/ccapi/server/unix/Makefile.in
@@ -12,4 +12,3 @@ clean-unix:: clean-libobjs
 
 @libobj_frag@
 
-# +++ Dependency line eater +++

diff --git a/src/ccapi/server/unix/deps b/src/ccapi/server/unix/deps
new file mode 100644 (file)
index 0000000..2feac3c
--- /dev/null
+++ b/src/ccapi/server/unix/deps
@@ -0,0 +1 @@
+# No dependencies here.

diff --git a/src/ccapi/test/deps b/src/ccapi/test/deps
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/configure.in b/src/configure.in
index 0f5af410c9a4d50b2cfd4538b44f4b6401743f7a..ef5af2dd1e93567f96798853877fc0fc18244e0f 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -1054,6 +1054,7 @@ V5_AC_OUTPUT_MAKEFILE(.
        lib/crypto/arcfour lib/crypto/yarrow lib/crypto/aes
 
        lib/krb5 lib/krb5/error_tables lib/krb5/asn.1 lib/krb5/ccache
+dnl    lib/krb5/ccache/ccapi
        lib/krb5/keytab lib/krb5/krb lib/krb5/rcache lib/krb5/os
        lib/krb5/unicode
 
@@ -1066,6 +1067,8 @@ V5_AC_OUTPUT_MAKEFILE(.
 
        lib/apputils
 
+dnl    ccapi ccapi/lib ccapi/lib/unix ccapi/server ccapi/server/unix ccapi/test
+
        kdc slave config-files gen-manpages include
 
        plugins/locate/python

diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 5dcf2adf66c26ba70234f782d38f6ebd5e771ba1..731505db8b528f83305bbf917dbb449ede1b6677 100644 (file)
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=../../..
 myfulldir=lib/krb5/ccache
 mydir=lib/krb5/ccache
 BUILDTOP=$(REL)..$(S)..$(S)..
-SUBDIRS =
+SUBDIRS = # ccapi
 DEFS=
 
 RUN_SETUP = @KRB5_RUN_ENV@

diff --git a/src/lib/krb5/ccache/ccapi/Makefile.in b/src/lib/krb5/ccache/ccapi/Makefile.in
index 201555a550c532c865b889a0056f971c0264e666..503a2c6890c547a37b75d0fa397a4222c09c96ba 100644 (file)
--- a/src/lib/krb5/ccache/ccapi/Makefile.in
+++ b/src/lib/krb5/ccache/ccapi/Makefile.in
@@ -1,10 +1,11 @@
-thisconfigdir=./../..
+thisconfigdir=../../../..
 myfulldir=lib/krb5/ccache/ccapi
-mydir=ccache/ccapi
+mydir=lib/krb5/ccache/ccapi
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = $(WIN_INCLUDES)
-DEFS=
+DEFS= -DUSE_CCAPI -DUSE_CCAPI_V3
 
+##DOS##DEFS=
 ##DOS##WIN_INCLUDES = -I$(SRCTOP)\windows\lib
 
 ##DOS##BUILDTOP = ..\..\..\..
@@ -24,3 +25,5 @@ SRCS  = $(srcdir)/stdcc.c $(srcdir)/stdcc_util.c $(srcdir)/winccld.c
 
 all-unix:: all-libobjs
 clean-unix:: clean-libobjs
+
+@libobj_frag@

diff --git a/src/lib/krb5/ccache/ccapi/deps b/src/lib/krb5/ccache/ccapi/deps
new file mode 100644 (file)
index 0000000..db881ca
--- /dev/null
+++ b/src/lib/krb5/ccache/ccapi/deps
@@ -0,0 +1,18 @@
+# 
+# Generated makefile dependencies follow.
+#
+stdcc.so stdcc.po $(OUTPRE)stdcc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \
+  $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \
+  $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \
+  $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
+  $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
+  $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
+  $(SRCTOP)/include/socket-utils.h stdcc.c stdcc.h stdcc_util.h
+stdcc_util.so stdcc_util.po $(OUTPRE)stdcc_util.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+  $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/krb5.h stdcc_util.c stdcc_util.h
+winccld.so winccld.po $(OUTPRE)winccld.$(OBJEXT): winccld.c

diff --git a/src/lib/krb5/ccache/ccapi/stdcc_util.c b/src/lib/krb5/ccache/ccapi/stdcc_util.c
index a9d1f43d028bd568bca4b757fa0aa5dd920f309e..114e79ed983744cc4d5b1f2e2ec160e3ebf9862e 100644 (file)
--- a/src/lib/krb5/ccache/ccapi/stdcc_util.c
+++ b/src/lib/krb5/ccache/ccapi/stdcc_util.c
@@ -17,7 +17,9 @@
 
 #include "stdcc_util.h"
 #include "krb5.h"
+#ifdef _WIN32                  /* it's part of krb5.h everywhere else */
 #include "kv5m_err.h"
+#endif
 
 #define fieldSize 255