From: Ken Raeburn <raeburn@mit.edu>
Date: Sat, 6 Apr 2002 00:37:20 +0000 (+0000)
Subject: delete no-op '-k' option
X-Git-Tag: krb5-1.3-alpha1~788
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7a7abd3b16d31acd862145157b931ebaa151f28a;p=krb5.git

delete no-op '-k' option

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14366 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog
index 86dff0089..59c97f97e 100644
--- a/src/tests/hammer/ChangeLog
+++ b/src/tests/hammer/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* kdc5_hammer.c (main): Delete '-k' option which didn't do
+	anything.
+	(usage): Don't display '-k' option.
+
 2001-10-09  Ken Raeburn  <raeburn@mit.edu>
 
 	* kdb5_hammer.c: Make prototypes unconditional.
diff --git a/src/tests/hammer/kdc5_hammer.c b/src/tests/hammer/kdc5_hammer.c
index 4aa750af0..d8b47fb82 100644
--- a/src/tests/hammer/kdc5_hammer.c
+++ b/src/tests/hammer/kdc5_hammer.c
@@ -81,7 +81,7 @@ int status;
     fprintf(stderr,
 	    "usage: %s -p prefix -n num_to_check [-c cachename] [-r realmname]\n",
 	    who);
-    fprintf(stderr, "\t [-D depth] [-k enctype]\n");
+    fprintf(stderr, "\t [-D depth]\n");
     fprintf(stderr, "\t [-P preauth type] [-R repeat_count] [-t] [-b] [-v] \n");
 
     exit(status);
@@ -122,7 +122,6 @@ main(argc, argv)
     char ctmp[4096], ctmp2[BUFSIZ], stmp[4096], stmp2[BUFSIZ];
     krb5_principal client_princ;
     krb5_error_code retval;
-    krb5_enctype enctype = DEFAULT_KDC_ENCTYPE;
 
     krb5_init_context(&test_context);
 
@@ -138,7 +137,7 @@ main(argc, argv)
     n_tried = 0;
     errors = 0;
 
-    while ((option = getopt(argc, argv, "D:p:n:c:R:k:P:e:bvr:t")) != -1) {
+    while ((option = getopt(argc, argv, "D:p:n:c:R:P:e:bvr:t")) != -1) {
 	switch (option) {
 	case 't':
 	    do_timer = 1;
@@ -165,9 +164,6 @@ main(argc, argv)
        case 'n':                        /* how many to check */
 	    num_to_check = atoi(optarg);
 	    break;
-	case 'k':
-	    enctype = atoi(optarg);
-	    break;
 	case 'P':
 	    patypedata[0] = atoi(optarg);
 	    patype = patypedata;
@@ -202,12 +198,6 @@ main(argc, argv)
 	}	    
     }
 
-    if (!valid_enctype(enctype)) {
-      com_err(prog, KRB5_PROG_ETYPE_NOSUPP,
-	      "while setting up enctype %d", enctype);
-      exit(1);
-    }
-
     if (ccache == NULL) {
 	if ((code = krb5_cc_default(test_context, &ccache))) {
 	    com_err(prog, code, "while getting default ccache");