Remove krb4 support from clients. Some of the code has been

simplified to remove architectural relics of the -4 and -5 options,
but more simplification is likely possible, particularly in kinit.

ticket: 6303
status: open

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

3 files changed, 6 insertions, 85 deletions

diff --git a/src/clients/kvno/Makefile.in b/src/clients/kvno/Makefile.in
index 6e9487aa45..4a8fc1af6b 100644
--- a/src/clients/kvno/Makefile.in
+++ b/src/clients/kvno/Makefile.in
@@ -23,8 +23,8 @@ all-unix:: kvno
 
 ##WIN32##all-windows:: $(KVNO)
 
-kvno: kvno.o $(KRB4COMPAT_DEPLIBS)
-	$(CC_LINK) -o $@ kvno.o $(KRB4COMPAT_LIBS)
+kvno: kvno.o $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $@ kvno.o $(KRB5_BASE_LIBS)
 
 ##WIN32##$(KVNO): $(OUTPRE)kvno.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj $(KLIB) $(CLIB) $(EXERES)
 ##WIN32##	link $(EXE_LINKOPTS) /out:$@ $**
diff --git a/src/clients/kvno/kvno.M b/src/clients/kvno/kvno.M
index ad2cb48183..b7e4d46a0d 100644
--- a/src/clients/kvno/kvno.M
+++ b/src/clients/kvno/kvno.M
@@ -28,7 +28,7 @@
 .SH NAME
 kvno \- print key version numbers of Kerberos principals
 .SH SYNOPSIS
-\fBkvno\fP [\fB\-q\fP] [\fB\-h\fP] [\fB\-4\fP\ |\ [\fB-c ccache\fP]\ [\fB\-e etype\fP]]
+\fBkvno\fP [\fB\-q\fP] [\fB\-h\fP] [\fB-c ccache\fP]\ [\fB\-e etype\fP]
 \fBservice1\fP \fBservice2\fP \fB...\fP
 .br
 .SH DESCRIPTION
@@ -51,11 +51,6 @@ suppress printing
 .B \-h
 prints a usage statement and exits
 .TP
-.B \-4
-specifies that Kerberos version 4 tickets should be acquired and
-described.  This option is only available if Kerberos 4 support was
-enabled at compilation time.
-.TP
 .B \-S sname
 specifies that krb5_sname_to_principal() will be used to build
 principal names.  If this flag is specified, the
@@ -70,16 +65,10 @@ uses the following environment variable:
 .TP "\w'.SM KRB5CCNAME\ \ 'u"
 .SM KRB5CCNAME
 Location of the credentials (ticket) cache.
-.TP
-.SM KRBTKFILE
-Location of the v4 ticket file.
 .SH FILES
 .TP "\w'/tmp/krb5cc_[uid]\ \ 'u"
 /tmp/krb5cc_[uid]
 default location of the credentials cache ([uid] is the decimal UID of
 the user).
-.TP
-/tmp/tkt[uid]
-default location of the v4 ticket file.
 .SH SEE ALSO
 kinit(1), kdestroy(1), krb5(3)
diff --git a/src/clients/kvno/kvno.c b/src/clients/kvno/kvno.c
index 1598bf58fd..c6e6477f11 100644
--- a/src/clients/kvno/kvno.c
+++ b/src/clients/kvno/kvno.c
@@ -39,20 +39,13 @@ static char *prog;
 
 static void xusage()
 {
-#ifdef KRB5_KRB4_COMPAT
-    fprintf(stderr, 
-            "usage: %s [-4 | [-c ccache] [-e etype] [-k keytab] [-S sname]] service1 service2 ...\n", 
-            prog);
-#else
     fprintf(stderr, "usage: %s [-c ccache] [-e etype] [-k keytab] [-S sname] service1 service2 ...\n",
             prog);
-#endif
     exit(1);
 }
 
 int quiet = 0;
 
-static void do_v4_kvno (int argc, char *argv[]);
 static void do_v5_kvno (int argc, char *argv[], 
                         char *ccachestr, char *etypestr, char *keytab_name,
 			char *sname);
@@ -66,14 +59,13 @@ int main(int argc, char *argv[])
     int option;
     char *etypestr = NULL, *ccachestr = NULL, *keytab_name = NULL;
     char *sname = NULL;
-    int v4 = 0;
 
     set_com_err_hook (extended_com_err_fn);
 
     prog = strrchr(argv[0], '/');
     prog = prog ? (prog + 1) : argv[0];
 
-    while ((option = getopt(argc, argv, "c:e:hk:q4S:")) != -1) {
+    while ((option = getopt(argc, argv, "c:e:hk:qS:")) != -1) {
 	switch (option) {
 	case 'c':
 	    ccachestr = optarg;
@@ -90,9 +82,6 @@ int main(int argc, char *argv[])
 	case 'q':
 	    quiet = 1;
 	    break;
-	case '4':
-	    v4 = 1;
-	    break;
 	case 'S':
 	    sname = optarg;
 	    break;
@@ -105,68 +94,11 @@ int main(int argc, char *argv[])
     if ((argc - optind) < 1)
 	xusage();
 
-    if ((ccachestr != NULL || etypestr != NULL || keytab_name != NULL) && v4)
-	xusage();
-
-    if (sname != NULL && v4)
-	xusage();
-
-    if (v4)
-	do_v4_kvno(argc - optind, argv + optind);
-    else
-	do_v5_kvno(argc - optind, argv + optind,
-		   ccachestr, etypestr, keytab_name, sname);
+    do_v5_kvno(argc - optind, argv + optind,
+	       ccachestr, etypestr, keytab_name, sname);
     return 0;
 }
 
-#ifdef KRB5_KRB4_COMPAT
-#include <kerberosIV/krb.h>
-#endif
-static void do_v4_kvno (int count, char *names[])
-{
-#ifdef KRB5_KRB4_COMPAT
-    int i;
-
-    for (i = 0; i < count; i++) {
-	int err;
-	char name[ANAME_SZ], inst[INST_SZ], realm[REALM_SZ];
-	KTEXT_ST req;
-	CREDENTIALS creds;
-	*name = *inst = *realm = '\0';
-	err = kname_parse (name, inst, realm, names[i]);
-	if (err) {
-	    fprintf(stderr, "%s: error parsing name '%s': %s\n",
-		    prog, names[i], krb_get_err_text(err));
-	    exit(1);
-	}
-	if (realm[0] == 0) {
-	    err = krb_get_lrealm(realm, 1);
-	    if (err) {
-		fprintf(stderr, "%s: error looking up local realm: %s\n",
-			prog, krb_get_err_text(err));
-		exit(1);
-	    }
-	}
-	err = krb_mk_req(&req, name, inst, realm, 0);
-	if (err) {
-	    fprintf(stderr, "%s: krb_mk_req error: %s\n", prog,
-		    krb_get_err_text(err));
-	    exit(1);
-	}
-	err = krb_get_cred(name, inst, realm, &creds);
-	if (err) {
-	    fprintf(stderr, "%s: krb_get_cred error: %s\n", prog,
-		    krb_get_err_text(err));
-	    exit(1);
-	}
-	if (!quiet)
-	    printf("%s: kvno = %d\n", names[i], creds.kvno);
-    }
-#else
-    xusage();
-#endif
-}
-
 #include <krb5.h>
 static krb5_context context;
 static void extended_com_err_fn (const char *myprog, errcode_t code,