lib/win/Makefile.in: Added

ccutils.c, ccapi_os_ipc.cxx, ccs_reply_proc.c, ccs_os_server.cpp, ccs_reply_proc.c, ccs_win_pipe.c:  comment out some debug messages.

test/Makefile.in: change which tests are built.
test/test_ccapi_context.c: API version 2 is now expected to pass.
test/test_ccapi_iterators.c:  Add progress indicator for long tests.

TargetVersion: 1.7
Component: krb5-libs
Ticket: 5594
Tags:  pullup

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

4 files changed, 121 insertions, 11 deletions

diff --git a/src/ccapi/server/win/Makefile.in b/src/ccapi/server/win/Makefile.in
new file mode 100644
index 000000000..ea095a050
--- /dev/null
+++ b/src/ccapi/server/win/Makefile.in
@@ -0,0 +1,110 @@
+# makefile: Constructs the Kerberos for Windows CCAPI server.

+

+#BUILDTOP is krb5/src and is relative to krb5/src/ccapi/server/win, for making Makefile.

+BUILDTOP=..\..\..\      

+CCAPI   = $(BUILDTOP)\CCAPI

+CO      = $(CCAPI)\common

+COWIN   = $(CCAPI)\common\win

+CCUTIL  = $(CCAPI)\common\win\OldCC             

+SRVDIR  = $(CCAPI)\server

+SRVWIN  = $(SRVDIR)\win

+POSIX   = $(BUILDTOP)\lib\krb5\posix

+SRCTMP  = $(SRVWIN)\srctmp

+

+!if defined(KRB5_KFW_COMPILE)

+KFWINC= /I$(BUILDTOP)\..\..\krbcc\include

+!endif

+

+OBJS	= $(OUTPRE)cci_array_internal.$(OBJEXT) \

+          $(OUTPRE)cci_cred_union.$(OBJEXT) \

+          $(OUTPRE)cci_debugging.$(OBJEXT) \

+          $(OUTPRE)cci_identifier.$(OBJEXT) \

+          $(OUTPRE)cci_message.$(OBJEXT) \

+          $(OUTPRE)cci_os_debugging.$(OBJEXT) \

+          $(OUTPRE)cci_os_identifier.$(OBJEXT) \

+          $(OUTPRE)cci_stream.$(OBJEXT) \

+          $(OUTPRE)ccs_array.$(OBJEXT) \

+          $(OUTPRE)ccs_cache_collection.$(OBJEXT) \

+          $(OUTPRE)ccs_callback.$(OBJEXT) \

+          $(OUTPRE)ccs_ccache.$(OBJEXT) \

+          $(OUTPRE)ccs_ccache_iterator.$(OBJEXT) \

+          $(OUTPRE)ccs_client.$(OBJEXT) \

+          $(OUTPRE)ccs_credentials.$(OBJEXT) \

+          $(OUTPRE)ccs_credentials_iterator.$(OBJEXT) \

+          $(OUTPRE)ccs_list.$(OBJEXT) \

+          $(OUTPRE)ccs_list_internal.$(OBJEXT) \

+          $(OUTPRE)ccs_lock.$(OBJEXT) \

+          $(OUTPRE)ccs_lock_state.$(OBJEXT) \

+          $(OUTPRE)ccs_os_pipe.$(OBJEXT) \

+          $(OUTPRE)ccs_os_server.$(OBJEXT) \

+          $(OUTPRE)ccs_pipe.$(OBJEXT) \

+          $(OUTPRE)ccs_reply_c.$(OBJEXT) \

+          $(OUTPRE)ccs_request_proc.$(OBJEXT) \

+          $(OUTPRE)ccs_server.$(OBJEXT) \

+          $(OUTPRE)ccs_win_pipe.$(OBJEXT) \

+          $(OUTPRE)ccs_request_s.$(OBJEXT) \

+          $(OUTPRE)ccutils.$(OBJEXT) \

+          $(OUTPRE)init.$(OBJEXT) \

+          $(OUTPRE)opts.$(OBJEXT) \

+          $(OUTPRE)secure.$(OBJEXT) \

+          $(OUTPRE)tls.$(OBJEXT) \

+          $(OUTPRE)util.$(OBJEXT) \

+          $(OUTPRE)win-utils.$(OBJEXT) \

+          $(OUTPRE)WorkItem.$(OBJEXT) \

+          $(OUTPRE)WorkQueue.$(OBJEXT)

+

+##### Options

+

+# Because all the sources are pulled together into the temp directory SRCTMP,

+#  the only includes we need are to directories outside of ccapi.

+LOCALINCLUDES = /I..\$(BUILDTOP) /I..\$(BUILDTOP)\include /I..\$(BUILDTOP)\include\krb5 $(KFWINC) \

+    -I..\$(BUILDTOP)\util\et /I.

+MIDLI  = /I..\$(BUILDTOP)\include

+

+CPPFLAGS = $(CPPFLAGS) /EHsc -D_CRTAPI1=_cdecl -D_CRTAPI2=_cdecl -DWINVER=0x0501 \

+-D_WIN32_WINNT=0x0501 -D_CRT_SECURE_NO_WARNINGS

+

+##### Linker

+LINK	= link

+LIBS	= rpcrt4.lib advapi32.lib ws2_32.lib user32.lib

+LFLAGS	= /nologo $(LOPTS)

+

+

+all:: Makefile copysrc midl $(OUTPRE)ccapiserver.exe finish

+

+ccs_request.h ccs_request_c.c ccs_request_s.c : ccs_request.idl ccs_request.acf

+    midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \

+    ccs_request.idl

+

+ccs_reply.h   ccs_reply_c.c   ccs_reply_s.c   : ccs_reply.idl   ccs_reply.acf

+    midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \

+    ccs_reply.idl

+

+copysrc :

+    echo "Copying all sources needed to build ccapiserver.exe to $(SRCTMP)"

+    if NOT exist $(SRCTMP)\nul mkdir $(SRCTMP)

+    xcopy /D/Y   $(CO)\*.*     $(SRCTMP)

+    xcopy /D/Y   $(COWIN)\*.*  $(SRCTMP)

+    xcopy /D/Y   $(CCUTIL)\*.* $(SRCTMP)

+    xcopy /D/Y   $(SRVDIR)\*.* $(SRCTMP)

+    xcopy /D/Y   $(SRVWIN)\*.* $(SRCTMP)

+    cd $(SRCTMP)

+    if NOT exist $(OUTPRE)\nul mkdir $(OUTPRE)

+

+midl : ccs_request.h ccs_reply.h

+

+$(OUTPRE)ccapiserver.exe: $(OBJS)

+	$(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(LIBS) $(conlibsdll) $(conflags) 

+

+finish : 

+    @echo "Finished building ccapiserver.exe"

+    cd

+

+clean:: 

+	if exist $(OUTPRE)*.exe del $(OUTPRE)*.exe

+	if exist $(OUTPRE)*.obj del $(OUTPRE)*.obj

+	if exist $(OUTPRE)*.res del $(OUTPRE)*.res

+	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)

diff --git a/src/ccapi/server/win/ccs_os_server.cpp b/src/ccapi/server/win/ccs_os_server.cpp
index 61392e9a3..a6725b4ed 100644
--- a/src/ccapi/server/win/ccs_os_server.cpp
+++ b/src/ccapi/server/win/ccs_os_server.cpp
@@ -242,9 +242,10 @@ cc_int32 ccs_os_server_listen_loop (int argc, const char *argv[]) {
 

             if (worklist_remove(&rpcmsg, &pipe, &buf, &serverStartTime)) {

                 uuid = ccs_win_pipe_getUuid(pipe);

+#if 0

                 cci_debug_printf("%s: processing WorkItem msg:%ld pipeUUID:<%s> pipeHandle:0x%X SST:%ld", 

                     __FUNCTION__, rpcmsg, uuid, ccs_win_pipe_getHandle(pipe), serverStartTime);

-

+#endif

                 if (serverStartTime <= getMySST()) {

                     switch (rpcmsg) {

                         case CCMSG_CONNECT: {

diff --git a/src/ccapi/server/win/ccs_request_proc.c b/src/ccapi/server/win/ccs_request_proc.c
index a1c082da0..e3c741bcc 100644
--- a/src/ccapi/server/win/ccs_request_proc.c
+++ b/src/ccapi/server/win/ccs_request_proc.c
@@ -46,10 +46,9 @@ void ccs_rpc_request(
     cci_stream_t    stream;
     DWORD*          p       = (DWORD*)(tspHandle);
     WIN_PIPE*       pipe    = NULL;
-
-    cci_debug_printf("%s rpcmsg:%d; UUID:<%s> SST:<%s>", 
-        __FUNCTION__, rpcmsg, pszUUID, serverStartTime);
-
+#if 0
+    cci_debug_printf("%s rpcmsg:%d; UUID:<%s> SST:<%s>", __FUNCTION__, rpcmsg, pszUUID, serverStartTime);
+#endif
     status = (rpcmsg != CCMSG_REQUEST) && (rpcmsg != CCMSG_PING);
     
     if (!status) {                         
@@ -74,9 +73,9 @@ void ccs_rpc_connect(
 
     DWORD*      p       = (DWORD*)(tspHandle);
     WIN_PIPE*   pipe    = ccs_win_pipe_new(pszUUID, *p);
-
+#if 0
     cci_debug_printf("%s; rpcmsg:%d; UUID: <%s>", __FUNCTION__, rpcmsg, pszUUID);
-
+#endif
     worklist_add(   rpcmsg, 
                     pipe,
                     NULL,               /* No payload with connect request */
@@ -91,9 +90,9 @@ CC_UINT32 ccs_authenticate(const CC_CHAR* name) {
     PDWORD      pvalue  = 0;
     CC_UINT32   result  = 0;
     DWORD       status  = 0;
-
+#if 0
     cci_debug_printf("%s ( %s )", __FUNCTION__, name);
-
+#endif
     hMap = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, (LPSTR)name);
     status  = !hMap;
 
diff --git a/src/ccapi/server/win/ccs_win_pipe.c b/src/ccapi/server/win/ccs_win_pipe.c
index 7c6137127..4ef807dd5 100644
--- a/src/ccapi/server/win/ccs_win_pipe.c
+++ b/src/ccapi/server/win/ccs_win_pipe.c
@@ -62,9 +62,9 @@ struct ccs_win_pipe_t* ccs_win_pipe_new (const char* uuid, const HANDLE h) {
         out_pipe->uuid          = uuidCopy;
         out_pipe->clientHandle  = h;
         }
-
+#if 0
     cci_debug_printf("0x%X = %s(%s, 0x%X)", out_pipe, __FUNCTION__, uuid, h);
-
+#endif
     return out_pipe;
     }