pull up r17907 from trunk

 r17907@cathode-dark-space:  jaltman | 2006-04-13 22:48:45 -0400
 ticket: 3542
 status: open

 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
version_fixed: 1.4.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@18357 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/windows/identity/doc/Makefile b/src/windows/identity/doc/Makefile
index fe2d91919c72b4794c6435ac610a9ebdf3b57089..85003999e223093fa9088d566c3870ac7940ecb2 100644 (file)
--- 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\r
 \r
 clean::\r
-       $(RMDIR) /s $(DOCDIR)\html\r
+       $(RMDIR) /s /q $(DOCDIR)\html\r
        $(RM) $(DOCDIR)\*.*\r

diff --git a/src/windows/identity/plugins/common/dynimport.c b/src/windows/identity/plugins/common/dynimport.c
index 7eecc754954a4a8d7504e34284c7ba02bc9d660d..9c93213f3c3ab72b716bf8c9f7878194dac8b9ca 100644 (file)
--- 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;\r
 \r
     imp_rv = LoadFuncs(CCAPI_DLL, ccapi_fi, &hCCAPI, 0, 1, 0, 0);\r
-    CKRV;\r
+    /* CCAPI_DLL is optional.  No error check. */\r
 \r
     memset(&osvi, 0, sizeof(OSVERSIONINFO));\r
     osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);\r