krb5 commit [krb5-1.10]: Define USE_CCAPI_V3 in krb5/ccache on windows

Tom Yu tlyu at MIT.EDU
Mon Jul 23 16:26:25 EDT 2012


https://github.com/krb5/krb5/commit/f0ce64204d1ba2969a17a2f934a33d6bc3a2313f
commit f0ce64204d1ba2969a17a2f934a33d6bc3a2313f
Author: Kevin Wasserman <kevin.wasserman at painless-security.com>
Date:   Thu Jul 12 16:23:21 2012 -0400

    Define USE_CCAPI_V3 in krb5/ccache on windows
    
    USE_CCAPI_V3 provides cccol iteration support for ccapi.
    
    Signed-off-by: Kevin Wasserman <kevin.wasserman at painless-security.com>
    
    (cherry picked from commit 227a1b093cb22eb7c6d7fee0759f28816572db70)
    
    Build lib/krb5/ccache/ccapi on Windows only
    
    Signed-off-by: Kevin Wasserman <kevin.wasserman at painless-security.com>
    
    (cherry picked from commit 8c3d2bfab7017a587d0c9a7de262cdcf18ce21c8)
    
    ticket: 7209
    version_fixed: 1.10.3
    status: resolved

 src/lib/krb5/ccache/Makefile.in       |    2 ++
 src/lib/krb5/ccache/ccapi/Makefile.in |    1 -
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index a094151..f64226b 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -1,7 +1,9 @@
 mydir=lib$(S)krb5$(S)ccache
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS = # ccapi
+WINSUBDIRS = ccapi
 DEFS=
+##WIN32##DEFS=$(DEFS) -DUSE_CCAPI -DUSE_CCAPI_V3
 
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/krb5/ccache/ccapi/Makefile.in b/src/lib/krb5/ccache/ccapi/Makefile.in
index 7adfb20..29f3b92 100644
--- a/src/lib/krb5/ccache/ccapi/Makefile.in
+++ b/src/lib/krb5/ccache/ccapi/Makefile.in
@@ -3,7 +3,6 @@ BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = $(WIN_INCLUDES)
 DEFS= -DUSE_CCAPI -DUSE_CCAPI_V3
 
-##DOS##DEFS=
 ##DOS##WIN_INCLUDES = -I$(top_srcdir)\windows\lib
 
 ##DOS##BUILDTOP = ..\..\..\..


More information about the cvs-krb5 mailing list