* kdestroy.M: Make up-to-date

* kdestroy.c: Add support for combining -5 and -4.  Add ability to
easily change defaults in terms of whether to use 5, 4 or both.
Expand usage info.

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

3 files changed, 96 insertions, 32 deletions

diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog
index a97da45449..fd6e321769 100644
--- a/src/clients/kdestroy/ChangeLog
+++ b/src/clients/kdestroy/ChangeLog
@@ -1,3 +1,11 @@
+2000-03-07  Danilo Almeida  <dalmeida@mit.edu>
+
+	* kdestroy.M: Make up-to-date.
+
+	* kdestroy.c: Add support for combining -5 and -4.  Add ability to
+	easily change defaults in terms of whether to use 5, 4 or both.
+	Expand usage info.
+
 2000-02-16  Danilo Almeida  <dalmeida@mit.edu>
 
 	* kdestroy.c: Fix GET_PROGNAME macro to properly return program
diff --git a/src/clients/kdestroy/kdestroy.M b/src/clients/kdestroy/kdestroy.M
index 68ce7033ed..c7d0135b72 100644
--- a/src/clients/kdestroy/kdestroy.M
+++ b/src/clients/kdestroy/kdestroy.M
@@ -26,7 +26,7 @@
 kdestroy \- destroy Kerberos tickets
 .SH SYNOPSIS
 .B kdestroy
-[\fB\-q\fP] [\fB\-c\fP \fIcache_name]
+[\fB\-5\fP] [\fB\-4\fP] [\fB\-q\fP] [\fB\-c\fP \fIcache_name]
 .br
 .SH DESCRIPTION
 The
@@ -35,8 +35,24 @@ utility destroys the user's active Kerberos authorization tickets by
 writing zeros to the specified credentials cache that contains them.  If
 the credentials cache is not specified, the default credentials cache is
 destroyed.
+If kdestroy was built with Kerberos 4 support, the default behavior is to
+destroy both Kerberos 5 and Kerberos 4 credentials.  Otherwise, kdestroy 
+will default to destroying only Kerberos 5 credentials.
 .SH OPTIONS
 .TP
+.B \-5
+destroy Kerberos 5 credentials.  This overrides whatever the default built-in
+behavior may be.  This option may be used with
+.B \-4
+.
+.TP
+.B \-4
+destroy Kerberos 4 credentials.  This overrides whatever the default built-in
+behavior may be.  This option is only available if kinit was built
+with Kerberos 4 compatibility.  This option may be used with 
+.B \-5
+.
+.TP
 .B \-q
 Run quietly.  Normally
 .B kdestroy
@@ -62,16 +78,24 @@ command in your
 file, so that your tickets are destroyed automatically when you log out.
 .SH ENVIRONMENT
 .B Kdestroy
-uses the following environment variable:
+uses the following environment variables:
 .TP "\w'.SM KRB5CCNAME\ \ 'u"
 .SM KRB5CCNAME
-Location of the credentials (ticket) cache.
+Location of the Kerberos 5 credentials (ticket) cache.
+.TP "\w'.SM KRBTKFILE\ \ 'u"
+.SM KRBTKFILE
+Filename of the Kerberos 4 credentials (ticket) cache.
 .SH FILES
 .TP "\w'/tmp/krb5cc_[uid]\ \ 'u"
 /tmp/krb5cc_[uid]
-default credentials cache ([uid] is the decimal UID of the user).
+default location of Kerberos 5 credentials cache 
+([uid] is the decimal UID of the user).
+.TP "\w'/tmp/tkt[uid]\ \ 'u"
+/tmp/tkt[uid]
+default location of Kerberos 4 credentials cache 
+([uid] is the decimal UID of the user).
 .SH SEE ALSO
-kinit(1), klist(1)
+kinit(1), klist(1), krb5(3)
 .SH BUGS
 .PP
 Only the tickets in the specified credentials cache are destroyed.
diff --git a/src/clients/kdestroy/kdestroy.c b/src/clients/kdestroy/kdestroy.c
index 5c9e77275c..c831f90d78 100644
--- a/src/clients/kdestroy/kdestroy.c
+++ b/src/clients/kdestroy/kdestroy.c
@@ -34,11 +34,6 @@
 
 #ifdef KRB5_KRB4_COMPAT
 #include <kerberosIV/krb.h>
-#define K54_OPT_STRING "45"
-#define K54_USAGE_STRING "[-4] [-5] "
-#else
-#define K54_OPT_STRING ""
-#define K54_USAGE_STRING ""
 #endif
 
 #ifdef __STDC__
@@ -56,6 +51,36 @@ extern char *optarg;
 #define GET_PROGNAME(x) max(max(strrchr((x), '/'), strrchr((x), '\\')) + 1,(x))
 #endif
 
+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
+
+
+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, "\t-q quiet mode\n");
+    fprintf(stderr, "\t-c specify name of credentials cache\n");
+    exit(2);
+}
+
 int
 main(argc, argv)
     int argc;
@@ -72,20 +97,17 @@ main(argc, argv)
     int quiet = 0;
     int v4 = 1;
 
-    int got_k4 = 0;
-    int got_k5 = 0;
-
-    int use_k4_only = 0;
-    int use_k5_only = 0;
+    int use_k5 = 0;
+    int use_k4 = 0;
 
-    char * progname = GET_PROGNAME(argv[0]);
+    progname = GET_PROGNAME(argv[0]);
 
     got_k5 = 1;
 #ifdef KRB5_KRB4_COMPAT
     got_k4 = 1;
 #endif
 
-    while ((c = getopt(argc, argv, K54_OPT_STRING "qc:")) != -1) {
+    while ((c = getopt(argc, argv, "54qc:")) != -1) {
 	switch (c) {
 	case 'q':
 	    quiet = 1;
@@ -98,14 +120,26 @@ main(argc, argv)
 		cache_name = optarg;
 	    }
 	    break;
-#ifdef KRB5_KRB4_COMPAT
 	case '4':
-	    use_k4_only = 1;
+	    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;
 	    break;
 	case '5':
-	    use_k5_only = 1;
+	    if (!got_k5)
+	    {
+		fprintf(stderr, "Kerberos 5 support could not be loaded\n");
+		exit(3);
+	    }
+	    use_k5 = 1;
 	    break;
-#endif
 	case '?':
 	default:
 	    errflg++;
@@ -113,24 +147,22 @@ main(argc, argv)
 	}
     }
 
-    if (use_k4_only && use_k5_only)
-    {
-	fprintf(stderr, "Only one of -4 and -5 allowed\n");
-	errflg++;
-    }
-
     if (optind != argc)
 	errflg++;
     
     if (errflg) {
-	fprintf(stderr, "Usage: %s " K54_USAGE_STRING 
-		"[-q] [ -c cache-name ]\n", progname);
-	exit(2);
+	usage();
+    }
+
+    if (!use_k5 && !use_k4)
+    {
+	use_k5 = default_k5;
+	use_k4 = default_k4;
     }
 
-    if (use_k4_only)
+    if (!use_k5)
 	got_k5 = 0;
-    if (use_k5_only)
+    if (!use_k4)
 	got_k4 = 0;
 
     if (got_k5) {