Windows: Build and install kdeltkt

kuser/NTMakefile

@@ -40,7 +40,8 @@ BINPROGRAMS=\
 	$(BINDIR)\kgetcred.exe	\
 	$(BINDIR)\kswitch.exe	\
 	$(BINDIR)\kvno.exe	\
-	$(BINDIR)\kcpytkt.exe
+	$(BINDIR)\kcpytkt.exe	\
+	$(BINDIR)\kdeltkt.exe
 
 LIBEXECPROGRAMS=\
 	$(LIBEXECDIR)\kdigest.exe	\
@@ -113,3 +114,7 @@ $(BINDIR)\kvno.exe: $(OBJ)\kvno.obj $(BINLIBS)
 $(BINDIR)\kcpytkt.exe: $(OBJ)\kcpytkt.obj $(BINLIBS)
 	$(EXECONLINK)
 	$(EXEPREP)
+
+$(BINDIR)\kdeltkt.exe: $(OBJ)\kdeltkt.obj $(BINLIBS)
+	$(EXECONLINK)
+	$(EXEPREP)

kuser/kdeltkt.c

@@ -0,0 +1,164 @@
+
+#include "kuser_locl.h"
+
+static char *etypestr = 0;
+static char *ccachestr = 0;
+static char *flagstr = 0;
+static int   quiet_flag = 0;
+static int   help_flag = 0;
+static int   version_flag = 0;
+
+struct getargs args[] = {
+    { "cache",  'c', arg_string, &ccachestr,
+      "Credentials cache", "cachename" },
+    { "enctype", 'e', arg_string, &etypestr,
+      "Encryption type", "enctype" },
+    { "flags", 'f', arg_string, &flagstr,
+      "Flags", "flags" },
+    { "quiet", 'q', arg_flag, &quiet_flag, "Quiet" },
+    { "version",        0, arg_flag, &version_flag },
+    { "help",           0, arg_flag, &help_flag }
+};
+
+static void
+usage(int ret)
+{
+    arg_printusage(args, sizeof(args)/sizeof(args[0]),
+                   "Usage: ", "service1 [service2 ...]");
+    exit(ret);
+}
+
+static void do_kdeltkt (int argc, char *argv[], char *ccachestr, char *etypestr, int flags);
+
+int main(int argc, char *argv[])
+{
+    int optidx = 0;
+    int flags = 0;
+
+    setprogname(argv[0]);
+
+    if (getarg(args, sizeof(args)/sizeof(args[0]), argc, argv, &optidx))
+        usage (1);
+
+    if (help_flag)
+        usage(0);
+
+    if (version_flag) {
+        print_version(NULL);
+        exit(0);
+    }
+
+    argc -= optidx;
+    argv += optidx;
+
+    if (argc < 1)
+        usage (1);
+
+    if (flagstr)
+        flags = atoi(flagstr);
+
+    do_kdeltkt(argc, argv, ccachestr, etypestr, flags);
+
+    return 0;
+}
+
+static void do_kdeltkt (int count, char *names[], 
+                        char *ccachestr, char *etypestr, int flags)
+{
+    krb5_context context;
+    krb5_error_code ret;
+    int i, errors;
+    krb5_enctype etype;
+    krb5_ccache ccache;
+    krb5_principal me;
+    krb5_creds in_creds, out_creds;
+    int retflags;
+    char *princ;
+
+    ret = krb5_init_context(&context);
+    if (ret)
+	errx(1, "krb5_init_context failed: %d", ret);
+
+    if (etypestr) {
+        ret = krb5_string_to_enctype(context, etypestr, &etype);
+	if (ret)
+            krb5_err(context, 1, ret, "Can't convert enctype %s", etypestr);
+        retflags = KRB5_TC_MATCH_SRV_NAMEONLY | KRB5_TC_MATCH_KEYTYPE;
+    } else {
+	etype = 0;
+        retflags = KRB5_TC_MATCH_SRV_NAMEONLY;
+    }
+
+    if (ccachestr)
+        ret = krb5_cc_resolve(context, ccachestr, &ccache);
+    else
+        ret = krb5_cc_default(context, &ccache);
+    if (ret)
+        krb5_err(context, 1, ret, "Can't open credentials cache");
+
+    ret = krb5_cc_get_principal(context, ccache, &me);
+    if (ret)
+        krb5_err(context, 1, ret, "Can't get client principal");
+
+    errors = 0;
+
+    for (i = 0; i < count; i++) {
+	memset(&in_creds, 0, sizeof(in_creds));
+
+	in_creds.client = me;
+
+	ret = krb5_parse_name(context, names[i], &in_creds.server);
+	if (ret) {
+	    if (!quiet_flag)
+                krb5_warn(context, ret, "Can't parse principal name %s", names[i]);
+	    errors++;
+	    continue;
+	}
+
+	ret = krb5_unparse_name(context, in_creds.server, &princ);
+	if (ret) {
+            krb5_warn(context, ret, "Can't unparse principal name %s", names[i]);
+	    errors++;
+	    continue;
+	}
+
+	in_creds.session.keytype = etype;
+
+        ret = krb5_cc_retrieve_cred(context, ccache, retflags,
+                                    &in_creds, &out_creds);  
+	if (ret) {
+            krb5_warn(context, ret, "Can't retrieve credentials for %s", princ);
+            
+	    krb5_free_unparsed_name(context, princ);
+
+	    errors++;
+	    continue;
+	}
+
+	ret = krb5_cc_remove_cred(context, ccache, flags, &out_creds);
+
+	krb5_free_principal(context, in_creds.server);
+
+	if (ret) {
+            krb5_warn(context, ret, "Can't remove credentials for %s", princ);
+
+            krb5_free_cred_contents(context, &out_creds);
+	    krb5_free_unparsed_name(context, princ);
+
+	    errors++;
+	    continue;
+	}
+
+	krb5_free_unparsed_name(context, princ);
+        krb5_free_cred_contents(context, &out_creds);
+    }
+
+    krb5_free_principal(context, me);
+    krb5_cc_close(context, ccache);
+    krb5_free_context(context);
+
+    if (errors)
+	exit(1);
+
+    exit(0);
+}

packages/windows/installer/heimdal-installer.wxs

@@ -16,6 +16,7 @@
   <?define GuidKpasswd=20A984EC-5BCB-4B93-A3A9-7AACBDC625E9 ?>
   <?define GuidKvno=2B932C2B-9167-4051-BDF7-A104E9983CE6 ?>
   <?define GuidKcpytkt=17734691-7CB3-4E9A-AADC-6D4205795F43 ?>
+  <?define GuidKdeltkt=3E853905-8CDA-4E14-8EBA-C0C4EEDB811A ?>
 
   <?else?>
 
@@ -32,6 +33,7 @@
   <?define GuidKpasswd=B66C04B5-EE1D-48C3-A25B-4DCAAA8F459B ?>
   <?define GuidKvno=4C6015BE-1347-4D12-8841-FF90E0B9D6A8 ?>
   <?define GuidKcpytkt=CBCDFC80-601B-4F26-A020-7D1278735B95 ?>
+  <?define GuidKdeltkt=6450EE72-E472-4709-B457-B579BFB2472B ?>
 
   <?endif?>
 
@@ -124,6 +126,13 @@
               <File Name='kcpytkt.pdb' />
             </Component>
 
+            <Component Id='comp.kdeltkt'
+                       Guid='$(var.GuidKdeltkt)'
+                       Win64='$(var.Win64)'>
+              <File Name='kdeltkt.exe' KeyPath='yes' />
+              <File Name='kdeltkt.pdb' />
+            </Component>
+
             <Merge Id='Heimdal.Assemblies' Language='0'
                    SourceFile='$(var.InstDir)\Heimdal.msm' />
 
@@ -311,6 +320,7 @@
       <ComponentRef Id='comp.Heimdal.chm' />
       <ComponentRef Id='comp.SearchPath' />
       <ComponentRef Id='comp.kcpytkt' />
+      <ComponentRef Id='comp.kdeltkt' />
       <ComponentRef Id='comp.kdestroy' />
       <ComponentRef Id='comp.kdigest' />
       <ComponentRef Id='comp.kinit' />