Some updates to compile and link on Windows, with recent CCAPI changes

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

diff --git a/src/ccapi/common/win/tls.h b/src/ccapi/common/win/tls.h
index b6761c8bb3368147dc66e103c702a2a016f30631..32854f0766d0d86948b518277d3e4239aa766655 100644 (file)
--- a/src/ccapi/common/win/tls.h
+++ b/src/ccapi/common/win/tls.h
@@ -33,7 +33,7 @@
 #include "time.h"
 #include "rpc.h"
 
-#include "cci_stream.h"
+#include "k5-ipc_stream.h"
 
 #define UUID_SIZE   128
 

diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in
index df4d95fd982cf3d1808295129d189a1641bd049d..9fa6c02dcadebe48145ee6bc291b62f6bfa2b842 100644 (file)
--- a/src/ccapi/lib/win/Makefile.in
+++ b/src/ccapi/lib/win/Makefile.in
@@ -7,6 +7,7 @@ OBJS    = $(OUTPRE)ccapi_ccache.obj \
           $(OUTPRE)ccapi_credentials.obj \\r
           $(OUTPRE)ccapi_credentials_iterator.obj \\r
           $(OUTPRE)ccapi_ipc.obj \\r
+         $(OUTPRE)ccapi_err.obj \\r
           $(OUTPRE)ccapi_os_ipc.obj \\r
           $(OUTPRE)ccapi_string.obj \\r
           $(OUTPRE)ccapi_v2.obj \\r
@@ -17,7 +18,6 @@ OBJS  = $(OUTPRE)ccapi_ccache.obj \
           $(OUTPRE)cci_message.obj \\r
           $(OUTPRE)cci_os_debugging.obj \\r
           $(OUTPRE)cci_os_identifier.obj \\r
-          $(OUTPRE)cci_stream.obj \\r
           $(OUTPRE)ccs_reply_proc.obj \\r
           $(OUTPRE)ccs_reply_s.obj \\r
           $(OUTPRE)ccs_request_c.obj \\r
@@ -62,7 +62,7 @@ CPPFLAGS = $(CPPFLAGS) /EHsc -D_CRTAPI1=_cdecl -D_CRTAPI2=_cdecl -DWINVER=0x0501
 \r
 ##### Linker\r
 LINK   = link\r
-LIBS   = kernel32.lib ws2_32.lib user32.lib advapi32.lib\r
+LIBS   = ..\$(CLIB) ..\$(SLIB) kernel32.lib ws2_32.lib user32.lib advapi32.lib\r
 LFLAGS = /nologo $(LOPTS)\r
 \r
 all:: Makefile copysrc midl $(OUTPRE)ccapi.dll finish\r

diff --git a/src/ccapi/server/win/Makefile.in b/src/ccapi/server/win/Makefile.in
index ea095a0506db8c761ec9c7f457dce557b0f94f81..3d8da6d223a4240a74eaaf6cc14b52a5cdd3a559 100644 (file)
--- a/src/ccapi/server/win/Makefile.in
+++ b/src/ccapi/server/win/Makefile.in
@@ -22,7 +22,6 @@ OBJS  = $(OUTPRE)cci_array_internal.$(OBJEXT) \
           $(OUTPRE)cci_message.$(OBJEXT) \\r
           $(OUTPRE)cci_os_debugging.$(OBJEXT) \\r
           $(OUTPRE)cci_os_identifier.$(OBJEXT) \\r
-          $(OUTPRE)cci_stream.$(OBJEXT) \\r
           $(OUTPRE)ccs_array.$(OBJEXT) \\r
           $(OUTPRE)ccs_cache_collection.$(OBJEXT) \\r
           $(OUTPRE)ccs_callback.$(OBJEXT) \\r
@@ -66,7 +65,7 @@ CPPFLAGS = $(CPPFLAGS) /EHsc -D_CRTAPI1=_cdecl -D_CRTAPI2=_cdecl -DWINVER=0x0501
 \r
 ##### Linker\r
 LINK   = link\r
-LIBS   = rpcrt4.lib advapi32.lib ws2_32.lib user32.lib\r
+LIBS   = ..\$(SLIB) rpcrt4.lib advapi32.lib ws2_32.lib user32.lib\r
 LFLAGS = /nologo $(LOPTS)\r
 \r
 \r

diff --git a/src/ccapi/server/win/WorkQueue.h b/src/ccapi/server/win/WorkQueue.h
index 42d0cf20725a5b8ea89ea5661b9c7d14651869eb..b451e1297403b5d2c5542d6086fc4069dd1bdc1a 100644 (file)
--- a/src/ccapi/server/win/WorkQueue.h
+++ b/src/ccapi/server/win/WorkQueue.h
@@ -28,7 +28,6 @@
 #define _work_queue_h
 
 #include "windows.h"
-#include "cci_stream.h"
 #include "ccs_pipe.h"
 
 EXTERN_C    BOOL worklist_isEmpty();
@@ -43,4 +42,4 @@ EXTERN_C    int  worklist_remove(long*              rpcmsg,
                                  k5_ipc_stream*      stream,
                                  time_t*            serverStartTime);
 
-#endif // _work_queue_h
\ No newline at end of file
+#endif // _work_queue_h

diff --git a/src/ccapi/server/win/ccs_os_server.cpp b/src/ccapi/server/win/ccs_os_server.cpp
index e80a1c3aaac3d4830b2f242e4b0734235d9a76fe..b22fdfa9b9b00ba6ff919508cdc6cebaa719c3e7 100644 (file)
--- a/src/ccapi/server/win/ccs_os_server.cpp
+++ b/src/ccapi/server/win/ccs_os_server.cpp
@@ -29,13 +29,12 @@
 \r
 extern "C" {\r
 #include "ccs_common.h"\r
+#include "ccs_os_notify.h"\r
 #include "ccs_os_server.h"\r
-#include <syslog.h>\r
 #include "ccs_reply.h"\r
 #include "ccs_request.h"\r
 #include "win-utils.h"\r
 #include "ccutils.h"\r
-#include "cci_stream.h"\r
     }\r
 \r
 #include "WorkQueue.h"\r
@@ -949,3 +948,16 @@ extern "C" void  __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) {
 extern "C" void __RPC_USER midl_user_free(void __RPC_FAR * ptr) {\r
     free(ptr);\r
     }\r
+\r
+/* stubs */\r
+extern "C" cc_int32\r
+ccs_os_notify_cache_collection_changed (ccs_cache_collection_t cc)\r
+{\r
+    return 0;\r
+}\r
+\r
+extern "C" cc_int32\r
+ccs_os_notify_ccache_changed (ccs_cache_collection_t cc, const char *name)\r
+{\r
+    return 0;\r
+}\r

diff --git a/src/ccapi/server/win/workitem.h b/src/ccapi/server/win/workitem.h
index 105380669ff99a60f149ea558f399f30853597ba..9829f8500d051dccdd0cf43a817b8a117c4ac9a5 100644 (file)
--- a/src/ccapi/server/win/workitem.h
+++ b/src/ccapi/server/win/workitem.h
@@ -5,7 +5,6 @@
 #include "windows.h"
 
 extern "C" {
-    #include "cci_stream.h"
     #include "ccs_pipe.h"
     }
 
@@ -45,4 +44,4 @@ public:
     bool isEmpty() {return wl.empty();}
     };
 
-#endif  // __WorkItem
\ No newline at end of file
+#endif  // __WorkItem