From 6ca528fbea27b0d8d42c5f2802e15b507c4da945 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Fri, 14 Apr 2006 02:48:45 +0000 Subject: [PATCH] identity/plugins/common/dynimport.c: During the interop session we concluded that the ccapi32.dll should not be required for netidmgr to operate. netidmgr should work with only FILE: ccaches. After the interop the removal of the error check post-load was not removed. identity/doc/Makefile: The 'clean' rules failed to specify the /Q switch which silently removes the directory tree. As a result, during the build the user was prompted. ticket: 3542 status: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17907 dc483132-0cff-0310-8789-dd5450dbe970 --- src/windows/identity/doc/Makefile | 2 +- src/windows/identity/plugins/common/dynimport.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/windows/identity/doc/Makefile b/src/windows/identity/doc/Makefile index fe2d91919..85003999e 100644 --- a/src/windows/identity/doc/Makefile +++ b/src/windows/identity/doc/Makefile @@ -64,5 +64,5 @@ CHM_FILE = "$(DOCDIR)\netiddev.chm" -$(HHC) $(DOCDIR)\html\index.hhp clean:: - $(RMDIR) /s $(DOCDIR)\html + $(RMDIR) /s /q $(DOCDIR)\html $(RM) $(DOCDIR)\*.* diff --git a/src/windows/identity/plugins/common/dynimport.c b/src/windows/identity/plugins/common/dynimport.c index 7eecc7549..9c93213f3 100644 --- a/src/windows/identity/plugins/common/dynimport.c +++ b/src/windows/identity/plugins/common/dynimport.c @@ -388,7 +388,7 @@ khm_int32 init_imports(void) { CKRV; imp_rv = LoadFuncs(CCAPI_DLL, ccapi_fi, &hCCAPI, 0, 1, 0, 0); - CKRV; + /* CCAPI_DLL is optional. No error check. */ memset(&osvi, 0, sizeof(OSVERSIONINFO)); osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); -- 2.26.2