STABLE14-windows-asetkey-20050612

Add asetkey.exe to the Windows distribution

(cherry picked from commit a08552748100597bea748b17a9ae1b8ddf4a9aa7)

diff --git a/src/WINNT/aklog/NTMakefile b/src/WINNT/aklog/NTMakefile
index 20d12cfb9c4a109358f86750c68778c4c7aa0b09..bf6a1327c202722ff6109f2c876431d364f514f2 100644 (file)
--- a/src/WINNT/aklog/NTMakefile
+++ b/src/WINNT/aklog/NTMakefile
@@ -15,12 +15,17 @@ RELDIR=WINNT\aklog
 # BUILD TARGETS
 #
 
-EXEFILE = $(DESTDIR)\root.client\usr\vice\etc\aklog.exe
+AKLOG = $(DESTDIR)\root.client\usr\vice\etc\aklog.exe
 
-EXEOBJS = \
+AKLOGOBJS = \
        $(OUT)\aklog.obj \
        $(OUT)\linked_list.obj
 
+ASETKEY = $(DESTDIR)\root.server\usr\afs\bin\asetkey.exe
+
+ASETKEYOBJS = \
+       $(OUT)\asetkey.obj
+
 EXELIBS = \
        $(DESTDIR)\lib\afs\afspioctl.lib \
     $(DESTDIR)\lib\afsauthent.lib \
@@ -29,20 +34,28 @@ EXELIBS = \
 OTHERLIBS = \
     ..\kfw\lib\i386\krbv4w32.lib \
     ..\kfw\lib\i386\krb5_32.lib \
+    ..\kfw\lib\i386\comerr32.lib \
     dnsapi.lib mpr.lib
 
 afscflags = -I..\kfw\inc\krb5 -I..\kfw\inc\krb4 $(afscflags)
 
-$(EXEOBJS): $$(@B).c
+$(AKLOGOBJS): $$(@B).c
+       $(C2OBJ) $**
+
+$(ASETKEYOBJS): $$(@B).c
        $(C2OBJ) $**
 
 ############################################################################
 
-$(EXEFILE) : $(EXEOBJS) $(EXELIBS) $(OUT)\aklog.res
+$(AKLOG) : $(AKLOGOBJS) $(EXELIBS) $(OUT)\aklog.res
        $(EXECONLINK) $(EXELIBS) $(OTHERLIBS)
        $(EXEPREP) 
 
-install : $(COPYHEADERS) $(EXEFILE)
+$(ASETKEY) : $(ASETKEYOBJS) $(EXELIBS) $(OUT)\asetkey.res
+       $(EXECONLINK) $(EXELIBS) $(OTHERLIBS)
+       $(EXEPREP) 
+
+install : $(COPYHEADERS) $(AKLOG) $(ASETKEY)
 
 ############################################################################
 #
@@ -51,9 +64,12 @@ install : $(COPYHEADERS) $(EXEFILE)
 
 $(OUT)\aklog.res : aklog.rc AFS_component_version_number.h
 
+$(OUT)\asetkey.res : asetkey.rc AFS_component_version_number.h
+
 mkdir:
        -mkdir $(OUT)\lang
        cd lang
        nmake /nologo /f ntmakefile SRC=$(SRC) OBJ=$(OBJ) mkdir
        cd ..
 
+                                             
\ No newline at end of file

diff --git a/src/WINNT/aklog/asetkey.c b/src/WINNT/aklog/asetkey.c
new file mode 100644 (file)
index 0000000..4e2479c
--- /dev/null
+++ b/src/WINNT/aklog/asetkey.c
@@ -0,0 +1,125 @@
+/*
+ * $Id$
+ *
+ * asetkey - Manipulates an AFS KeyFile
+ *
+ * Updated for Kerberos 5
+ */
+
+#include <winsock.h>
+
+#include <sys/types.h>
+#include <krb5.h>
+
+#include <afs/stds.h>
+#include <afs/cellconfig.h>
+#include <afs/keys.h>
+#ifndef PRE_AFS35
+#include <afs/dirpath.h>
+#endif /* !PRE_AFS35 */
+
+int
+main(int argc, char **argv)
+{
+    struct afsconf_dir *tdir;
+    register long code;
+    const char *confdir;
+
+    if (argc == 1) {
+       printf("asetkey: usage is 'setkey <opcode> options, e.g.\n");
+       printf("    asetkey add <kvno> <keyfile> <princ>\n");
+       printf("    asetkey delete <kvno>\n");
+       printf("    asetkey list\n");
+       exit(1);
+    }
+
+#ifdef PRE_AFS35
+    confdir = AFSCONF_SERVERNAME;
+#else /* PRE_AFS35 */
+    confdir = AFSDIR_SERVER_ETC_DIRPATH;
+#endif /* PRE_AFS35 */
+
+    tdir = afsconf_Open(confdir);
+    if (!tdir) {
+       printf("asetkey: can't initialize conf dir '%s'\n", confdir);
+       exit(1);
+    }
+    if (strcmp(argv[1], "add")==0) {
+       krb5_context context;
+       krb5_principal principal;
+       krb5_keyblock *key;
+       krb5_error_code retval;
+       int kvno;
+
+       if (argc != 5) {
+           printf("asetkey add: usage is 'asetkey add <kvno> <keyfile> <princ>\n");
+           exit(1);
+       }
+
+       krb5_init_context(&context);
+
+       kvno = atoi(argv[2]);
+       retval = krb5_parse_name(context, argv[4], &principal);
+       if (retval != 0) {
+               com_err(argv[0], retval, "while parsing AFS principal");
+               exit(1);
+       }
+       retval = krb5_kt_read_service_key(context, argv[3], principal, kvno,
+                                         ENCTYPE_DES_CBC_CRC, &key);
+       if (retval != 0) {
+               com_err(argv[0], retval, "while extracting AFS service key");
+               exit(1);
+       }
+
+       if (key->length != 8) {
+               printf("Key length should be 8, but is really %d!\n",
+                      key->length);
+               exit(1);
+       }
+
+       code = afsconf_AddKey(tdir, kvno, key->contents, 1);
+       if (code) {
+           printf("asetkey: failed to set key, code %d.\n", code);
+           exit(1);
+       }
+       krb5_free_principal(context, principal);
+       krb5_free_keyblock(context, key);
+    }
+    else if (strcmp(argv[1], "delete")==0) {
+       long kvno;
+       if (argc != 3) {
+           printf("asetkey delete: usage is 'asetkey delete <kvno>\n");
+           exit(1);
+       }
+       kvno = atoi(argv[2]);
+       code = afsconf_DeleteKey(tdir, kvno);
+       if (code) {
+           printf("asetkey: failed to delete key %d, (code %d)\n", kvno, code);
+           exit(1);
+       }
+    }
+    else if (strcmp(argv[1], "list") == 0) {
+       struct afsconf_keys tkeys;
+       register int i, j;
+       
+       code = afsconf_GetKeys(tdir, &tkeys);
+       if (code) {
+           printf("asetkey: failed to get keys, code %d\n", code);
+           exit(1);
+       }
+       for(i=0;i<tkeys.nkeys;i++) {
+           if (tkeys.key[i].kvno != -1) {
+               printf("kvno %4d: key is: ", tkeys.key[i].kvno);
+               for (j = 0; j < 8; j++)
+                       printf("%02x", (unsigned char) tkeys.key[i].key[j]);
+               printf("\n");
+           }
+       }
+       printf("All done.\n");
+    }
+    else {
+       printf("asetkey: unknown operation '%s', type 'asetkey' for assistance\n", argv[1]);
+       exit(1);
+    }
+    exit(0);
+}

diff --git a/src/WINNT/aklog/asetkey.rc b/src/WINNT/aklog/asetkey.rc
new file mode 100644 (file)
index 0000000..cd332a3
--- /dev/null
+++ b/src/WINNT/aklog/asetkey.rc
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+/* Define VERSIONINFO resource */
+
+#define  AFS_VERINFO_FILE_DESCRIPTION "AFS Set Key Command"
+#define AFS_VERINFO_NAME "asetkey"
+#define AFS_VERINFO_FILENAME "asetkey.exe"
+
+#include "AFS_component_version_number.h"
+#include "..\..\config\NTVersioninfo.rc"