From 6d7b1fcf7a6b6a600b789b4ecca53769655b3ec9 Mon Sep 17 00:00:00 2001
From: Love Hornquist Astrand <lha@h5l.org>
Date: Thu, 25 Nov 2010 10:15:49 -0800
Subject: [PATCH] start to build kcc for windows

---
 kuser/NTMakefile                           | 24 ++++++++++-----
 kuser/{klist-version.rc => kcc-version.rc} |  4 +--
 kuser/kswitch-version.rc                   | 36 ----------------------
 3 files changed, 18 insertions(+), 46 deletions(-)
 rename kuser/{klist-version.rc => kcc-version.rc} (94%)
 delete mode 100644 kuser/kswitch-version.rc

diff --git a/kuser/NTMakefile b/kuser/NTMakefile
index bb0669b65..e47f09389 100644
--- a/kuser/NTMakefile
+++ b/kuser/NTMakefile
@@ -35,10 +35,9 @@ RELDIR=kuser
 
 BINPROGRAMS=\
 	$(BINDIR)\kinit.exe	\
-	$(BINDIR)\klist.exe	\
+	$(BINDIR)\kcc.exe	\
 	$(BINDIR)\kdestroy.exe	\
 	$(BINDIR)\kgetcred.exe	\
-	$(BINDIR)\kswitch.exe	\
 	$(BINDIR)\kvno.exe	\
 	$(BINDIR)\kcpytkt.exe	\
 	$(BINDIR)\kdeltkt.exe
@@ -69,7 +68,7 @@ $(BINDIR)\kinit.exe: $(OBJ)\kinit.obj $(BINLIBS) $(OBJ)\kinit-version.res
 	$(EXECONLINK)
 	$(EXEPREP)
 
-$(BINDIR)\klist.exe: $(OBJ)\klist.obj $(BINLIBS) $(OBJ)\klist-version.res
+$(BINDIR)\kcc.exe: $(OBJ)\kcc-commands.obj $(OBJ)\kcc.obj $(obj)\kswitch.obj $(obj)\klist.obj $(BINLIBS) $(OBJ)\kcc-version.res
 	$(EXECONLINK)
 	$(EXEPREP)
 
@@ -84,11 +83,6 @@ $(BINDIR)\kgetcred.exe: $(OBJ)\kgetcred.obj $(BINLIBS) $(OBJ)\kgetcred-version.r
 	$(EXEPREP)
 
 
-$(BINDIR)\kswitch.exe: $(OBJ)\kswitch.obj $(BINLIBS) $(LIBEDITLINE) $(OBJ)\kswitch-version.res
-	$(EXECONLINK)
-	$(EXEPREP)
-
-
 $(LIBEXECDIR)\kdigest.exe: $(OBJ)\kdigest-commands.obj $(OBJ)\kdigest.obj $(BINLIBS) $(LIBSL) $(OBJ)\kdigest-version.res
 	$(EXECONLINK)
 	$(EXEPREP)
@@ -102,6 +96,20 @@ $(OBJ)\kdigest-commands.c $(OBJ)\kdigest-commands.h: kdigest-commands.in
 	$(BINDIR)\slc.exe kdigest-commands.in
 	cd $(SRCDIR)
 
+$(OBJ)\kcc.obj: kcc.c
+	$(C2OBJ) -I$(OBJ)
+
+$(OBJ)\kswitch.obj: kswitch.c
+	$(C2OBJ) -I$(OBJ)
+
+$(OBJ)\klist.obj: klist.c
+	$(C2OBJ) -I$(OBJ)
+
+$(OBJ)\kcc-commands.c $(OBJ)\kcc-commands.h: kcc-commands.in
+	cd $(OBJ)
+	$(CP) $(SRCDIR)\kcc-commands.in $(OBJ)
+	$(BINDIR)\slc.exe kcc-commands.in
+	cd $(SRCDIR)
 
 $(LIBEXECDIR)\kimpersonate.exe: $(OBJ)\kimpersonate.obj $(BINLIBS) $(OBJ)\kimpersonate-version.res
 	$(EXECONLINK)
diff --git a/kuser/klist-version.rc b/kuser/kcc-version.rc
similarity index 94%
rename from kuser/klist-version.rc
rename to kuser/kcc-version.rc
index c98b7f406..6c47c500d 100644
--- a/kuser/klist-version.rc
+++ b/kuser/kcc-version.rc
@@ -30,7 +30,7 @@
  **********************************************************************/
 
 #define RC_FILE_TYPE VFT_APP
-#define RC_FILE_DESC_0409 "List Kerberos Tickets"
-#define RC_FILE_ORIG_0409 "klist.exe"
+#define RC_FILE_DESC_0409 "Ticket tool"
+#define RC_FILE_ORIG_0409 "kcc.exe"
 
 #include "../windows/version.rc"
diff --git a/kuser/kswitch-version.rc b/kuser/kswitch-version.rc
deleted file mode 100644
index 3437e275d..000000000
--- a/kuser/kswitch-version.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2010, Secure Endpoints Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in
- *   the documentation and/or other materials provided with the
- *   distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- **********************************************************************/
-
-#define RC_FILE_TYPE VFT_APP
-#define RC_FILE_DESC_0409 "Switch Between Default Credential Caches"
-#define RC_FILE_ORIG_0409 "kswitch.exe"
-
-#include "../windows/version.rc"