summaryrefslogtreecommitdiffstats
path: root/src/ccapi/lib
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2010-11-25 20:28:30 +0000
committerGreg Hudson <ghudson@mit.edu>2010-11-25 20:28:30 +0000
commit530043377ee6f39b9ca95c13f6260602e6fe7674 (patch)
tree28fd4b42c486d7097c4cd537d90042bb5fda3852 /src/ccapi/lib
parente9dd6e21afc9af2237e9ae5590ad5a67e52fb24e (diff)
downloadkrb5-530043377ee6f39b9ca95c13f6260602e6fe7674.tar.gz
krb5-530043377ee6f39b9ca95c13f6260602e6fe7674.tar.xz
krb5-530043377ee6f39b9ca95c13f6260602e6fe7674.zip
Fix Windows build
Repair the Windows build. Tested with the prepare-on-Unix method. Some specific changes include: * Removed the IPC finalizer (no longer used after r20787) from ccapi/lib/ccapi_ipc.c, as it was creating a difficult dependency chain for the pingtest build in ccapi/test. Also updated pingtest to use the k5_ipc_stream interfaces since cci_stream is gone. * Reverted the apparently non-functional r20277. * klist -V prints just "Kerberos for Windows", since it has no access to PACKAGE_NAME and PACKAGE_VERSION from autoconf. This should be addressed correctly. * krb5, telnet, gssftp, and NIM are removed from the build. * Some files had CRLFs; these were replaced with LFs and the svn:eol-style property set on the files. Otherwise the CRLFs became CRCRLFs after the zip transfer. * Windows does not have opendir/readdir, so added Windows code to prof_parse.c for includedir. Probable fodder for a libkrb5support portability shim. ticket: 6826 target_version: 1.9 tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24533 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/ccapi/lib')
-rw-r--r--src/ccapi/lib/ccapi_context.c1
-rw-r--r--src/ccapi/lib/ccapi_ipc.c7
-rw-r--r--src/ccapi/lib/ccapi_ipc.h1
-rw-r--r--src/ccapi/lib/ccapi_os_ipc.h1
-rw-r--r--src/ccapi/lib/mac/ccapi_os_ipc.c8
-rw-r--r--src/ccapi/lib/win/Makefile.in2
-rw-r--r--src/ccapi/lib/win/ccapi_os_ipc.cxx7
7 files changed, 1 insertions, 26 deletions
diff --git a/src/ccapi/lib/ccapi_context.c b/src/ccapi/lib/ccapi_context.c
index da8aa59f08..7715139ff4 100644
--- a/src/ccapi/lib/ccapi_context.c
+++ b/src/ccapi/lib/ccapi_context.c
@@ -114,7 +114,6 @@ static void cci_thread_fini (void)
remove_error_table(&et_CAPI_error_table);
cci_context_change_time_thread_fini ();
- cci_ipc_thread_fini ();
}
diff --git a/src/ccapi/lib/ccapi_ipc.c b/src/ccapi/lib/ccapi_ipc.c
index 54b5faa867..0f14df80af 100644
--- a/src/ccapi/lib/ccapi_ipc.c
+++ b/src/ccapi/lib/ccapi_ipc.c
@@ -36,13 +36,6 @@ cc_int32 cci_ipc_thread_init (void)
/* ------------------------------------------------------------------------ */
-void cci_ipc_thread_fini (void)
-{
- cci_os_ipc_thread_fini ();
-}
-
-/* ------------------------------------------------------------------------ */
-
static cc_int32 _cci_ipc_send (enum cci_msg_id_t in_request_name,
cc_int32 in_launch_server,
cci_identifier_t in_identifier,
diff --git a/src/ccapi/lib/ccapi_ipc.h b/src/ccapi/lib/ccapi_ipc.h
index 5b7d5d3745..03b890b1fc 100644
--- a/src/ccapi/lib/ccapi_ipc.h
+++ b/src/ccapi/lib/ccapi_ipc.h
@@ -30,7 +30,6 @@
#include "cci_common.h"
cc_int32 cci_ipc_thread_init (void);
-void cci_ipc_thread_fini (void);
cc_int32 cci_ipc_send (enum cci_msg_id_t in_request_name,
cci_identifier_t in_identifier,
diff --git a/src/ccapi/lib/ccapi_os_ipc.h b/src/ccapi/lib/ccapi_os_ipc.h
index b5e0405997..eabea254e2 100644
--- a/src/ccapi/lib/ccapi_os_ipc.h
+++ b/src/ccapi/lib/ccapi_os_ipc.h
@@ -30,7 +30,6 @@
#include "cci_common.h"
cc_int32 cci_os_ipc_thread_init (void);
-void cci_os_ipc_thread_fini (void);
cc_int32 cci_os_ipc (cc_int32 in_launch_server,
k5_ipc_stream in_request_stream,
diff --git a/src/ccapi/lib/mac/ccapi_os_ipc.c b/src/ccapi/lib/mac/ccapi_os_ipc.c
index e0a81d8786..a25297e311 100644
--- a/src/ccapi/lib/mac/ccapi_os_ipc.c
+++ b/src/ccapi/lib/mac/ccapi_os_ipc.c
@@ -40,14 +40,6 @@ cc_int32 cci_os_ipc_thread_init (void)
/* ------------------------------------------------------------------------ */
-void cci_os_ipc_thread_fini (void)
-{
- /* k5_ipc_send_request handles all thread data for us */
- return;
-}
-
-/* ------------------------------------------------------------------------ */
-
cc_int32 cci_os_ipc (cc_int32 in_launch_server,
k5_ipc_stream in_request_stream,
k5_ipc_stream *out_reply_stream)
diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in
index d5ca7a55be..7ca749a189 100644
--- a/src/ccapi/lib/win/Makefile.in
+++ b/src/ccapi/lib/win/Makefile.in
@@ -116,4 +116,4 @@ clean::
if exist $(OUTPRE)*.map del $(OUTPRE)*.map
if exist $(OUTPRE)*.pdb del $(OUTPRE)*.pdb
if exist *.err del *.err
- if exist $(SRCTMP) rm -rf $(SRCTMP)
+ if exist $(SRCTMP) rmdir /s /q $(SRCTMP)
diff --git a/src/ccapi/lib/win/ccapi_os_ipc.cxx b/src/ccapi/lib/win/ccapi_os_ipc.cxx
index b6fc70155c..062558cb1f 100644
--- a/src/ccapi/lib/win/ccapi_os_ipc.cxx
+++ b/src/ccapi/lib/win/ccapi_os_ipc.cxx
@@ -120,13 +120,6 @@ extern "C" cc_int32 cci_os_ipc_thread_init (void) {
/* ------------------------------------------------------------------------ */
-void cci_os_ipc_thread_fini (void)
-{
-}
-
-
-/* ------------------------------------------------------------------------ */
-
cc_int32 cci_os_ipc (cc_int32 in_launch_server,
k5_ipc_stream in_request_stream,
k5_ipc_stream* out_reply_stream) {