1 files changed, 25 insertions, 103 deletions

diff --git a/src/clients/kdestroy/kdestroy.c b/src/clients/kdestroy/kdestroy.c
index f7bcef7cdd..3f2f326823 100644
--- a/src/clients/kdestroy/kdestroy.c
+++ b/src/clients/kdestroy/kdestroy.c
@@ -36,10 +36,6 @@
 #include <unistd.h>
 #endif
 
-#ifdef KRB5_KRB4_COMPAT
-#include <kerberosIV/krb.h>
-#endif
-
 #ifdef __STDC__
 #define BELL_CHAR '\a'
 #else
@@ -57,29 +53,12 @@ extern char *optarg;
 
 char *progname;
 
-int got_k5 = 0;
-int got_k4 = 0;
-
-int default_k5 = 1;
-#ifdef KRB5_KRB4_COMPAT
-int default_k4 = 1;
-#else
-int default_k4 = 0;
-#endif
-
 
 static void usage()
 {
 #define KRB_AVAIL_STRING(x) ((x)?"available":"not available")
 
-    fprintf(stderr, "Usage: %s [-5] [-4] [-q] [-c cache_name]\n", progname);
-    fprintf(stderr, "\t-5 Kerberos 5 (%s)\n", KRB_AVAIL_STRING(got_k5));
-    fprintf(stderr, "\t-4 Kerberos 4 (%s)\n", KRB_AVAIL_STRING(got_k4));
-    fprintf(stderr, "\t   (Default is %s%s%s%s)\n",
-	    default_k5?"Kerberos 5":"",
-	    (default_k5 && default_k4)?" and ":"",
-	    default_k4?"Kerberos 4":"",
-	    (!default_k5 && !default_k4)?"neither":"");
+    fprintf(stderr, "Usage: %s [-q] [-c cache_name]\n", progname);
     fprintf(stderr, "\t-q quiet mode\n");
     fprintf(stderr, "\t-c specify name of credentials cache\n");
     exit(2);
@@ -96,23 +75,11 @@ main(argc, argv)
     krb5_ccache cache = NULL;
     char *cache_name = NULL;
     int code = 0;
-#ifdef KRB5_KRB4_COMPAT
-    int v4code = 0;
-    int v4 = 1;
-#endif
     int errflg = 0;
     int quiet = 0;
 
-    int use_k5 = 0;
-    int use_k4 = 0;
-
     progname = GET_PROGNAME(argv[0]);
 
-    got_k5 = 1;
-#ifdef KRB5_KRB4_COMPAT
-    got_k4 = 1;
-#endif
-
     while ((c = getopt(argc, argv, "54qc:")) != -1) {
 	switch (c) {
 	case 'q':
@@ -127,24 +94,10 @@ main(argc, argv)
 	    }
 	    break;
 	case '4':
-	    if (!got_k4)
-	    {
-#ifdef KRB5_KRB4_COMPAT
-		fprintf(stderr, "Kerberos 4 support could not be loaded\n");
-#else
-		fprintf(stderr, "This was not built with Kerberos 4 support\n");
-#endif
-		exit(3);
-	    }
-	    use_k4 = 1;
+	    fprintf(stderr, "Kerberos 4 is no longer supported\n");
+	    exit(3);
 	    break;
 	case '5':
-	    if (!got_k5)
-	    {
-		fprintf(stderr, "Kerberos 5 support could not be loaded\n");
-		exit(3);
-	    }
-	    use_k5 = 1;
 	    break;
 	case '?':
 	default:
@@ -160,69 +113,38 @@ main(argc, argv)
 	usage();
     }
 
-    if (!use_k5 && !use_k4)
-    {
-	use_k5 = default_k5;
-	use_k4 = default_k4;
+    retval = krb5_init_context(&kcontext);
+    if (retval) {
+	com_err(progname, retval, "while initializing krb5");
+	exit(1);
     }
 
-    if (!use_k5)
-	got_k5 = 0;
-    if (!use_k4)
-	got_k4 = 0;
-
-    if (got_k5) {
-	retval = krb5_init_context(&kcontext);
-	if (retval) {
-	    com_err(progname, retval, "while initializing krb5");
+    if (cache_name) {
+	code = krb5_cc_resolve (kcontext, cache_name, &cache);
+	if (code != 0) {
+	    com_err (progname, code, "while resolving %s", cache_name);
 	    exit(1);
 	}
-
-	if (cache_name) {
-#ifdef KRB5_KRB4_COMPAT
-	    v4 = 0;	/* Don't do v4 if doing v5 and cache name given. */
-#endif
-	    code = krb5_cc_resolve (kcontext, cache_name, &cache);
-	    if (code != 0) {
-		com_err (progname, code, "while resolving %s", cache_name);
-		exit(1);
-	    }
-	} else {
-	    code = krb5_cc_default(kcontext, &cache);
-	    if (code) {
-		com_err(progname, code, "while getting default ccache");
-		exit(1);
-	    }
-	}
-
-	code = krb5_cc_destroy (kcontext, cache);
-	if (code != 0) {
-	    com_err (progname, code, "while destroying cache");
-	    if (code != KRB5_FCC_NOFILE) {
-		if (quiet)
-		    fprintf(stderr, "Ticket cache NOT destroyed!\n");
-		else {
-		    fprintf(stderr, "Ticket cache %cNOT%c destroyed!\n", 
-			    BELL_CHAR, BELL_CHAR);
-		}
-		errflg = 1;
-	    }
+    } else {
+	code = krb5_cc_default(kcontext, &cache);
+	if (code) {
+	    com_err(progname, code, "while getting default ccache");
+	    exit(1);
 	}
     }
-#ifdef KRB5_KRB4_COMPAT
-    if (got_k4 && v4) {
-	v4code = dest_tkt();
-	if (v4code == KSUCCESS && code != 0)
-	    fprintf(stderr, "Kerberos 4 ticket cache destroyed.\n");
-	if (v4code != KSUCCESS && v4code != RET_TKFIL) {
+
+    code = krb5_cc_destroy (kcontext, cache);
+    if (code != 0) {
+	com_err (progname, code, "while destroying cache");
+	if (code != KRB5_FCC_NOFILE) {
 	    if (quiet)
-		fprintf(stderr, "Kerberos 4 ticket cache NOT destroyed!\n");
-	    else
-		fprintf(stderr, "Kerberos 4 ticket cache %cNOT%c destroyed!\n",
+		fprintf(stderr, "Ticket cache NOT destroyed!\n");
+	    else {
+		fprintf(stderr, "Ticket cache %cNOT%c destroyed!\n", 
 			BELL_CHAR, BELL_CHAR);
+	    }
 	    errflg = 1;
 	}
     }
-#endif
     return errflg;
 }