1 files changed, 66 insertions, 26 deletions

diff --git a/crypto/heimdal/kadmin/get.c b/crypto/heimdal/kadmin/get.c
index 1492ca9..7ecea7c 100644
--- a/crypto/heimdal/kadmin/get.c
+++ b/crypto/heimdal/kadmin/get.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2000 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -34,7 +34,7 @@
 #include "kadmin_locl.h"
 #include <parse_units.h>
 
-RCSID("$Id: get.c,v 1.8 1999/12/02 17:04:58 joda Exp $");
+RCSID("$Id: get.c,v 1.12 2000/12/15 14:24:24 joda Exp $");
 
 struct get_entry_data {
     void (*header)(void);
@@ -102,11 +102,27 @@ print_entry_short(kadm5_principal_ent_t princ)
     printf("\n");
 }
 
+/*
+ * return 0 iff `salt' actually is the same as the current salt in `k'
+ */
+
+static int
+cmp_salt (const krb5_salt *salt, const krb5_key_data *k)
+{
+    if (salt->salttype != k->key_data_type[1])
+	return 1;
+    if (salt->saltvalue.length != k->key_data_length[1])
+	return 1;
+    return memcmp (salt->saltvalue.data, k->key_data_contents[1],
+		   salt->saltvalue.length);
+}
+
 static void
 print_entry_long(kadm5_principal_ent_t princ)
 {
     char buf[1024];
     int i;
+    krb5_salt def_salt;
     
     krb5_unparse_name_fixed(context, princ->principal, buf, sizeof(buf));
     printf("%24s: %s\n", "Principal", buf);
@@ -134,17 +150,21 @@ print_entry_long(kadm5_principal_ent_t princ)
     printf("%24s: %d\n", "Failed login count", princ->fail_auth_count);
     time_t2str(princ->mod_date, buf, sizeof(buf), 1);
     printf("%24s: %s\n", "Last modified", buf);
-    krb5_unparse_name_fixed(context, princ->mod_name, buf, sizeof(buf));
-    printf("%24s: %s\n", "Modifier", buf);
+    if(princ->mod_name != NULL) {
+	krb5_unparse_name_fixed(context, princ->mod_name, buf, sizeof(buf));
+	printf("%24s: %s\n", "Modifier", buf);
+    }
     attributes2str (princ->attributes, buf, sizeof(buf));
     printf("%24s: %s\n", "Attributes", buf);
 
-    printf("%24s: ", "Keytypes(salts)");
+    printf("%24s: ", "Keytypes(salttype[(salt-value)])");
+
+    krb5_get_pw_salt (context, princ->principal, &def_salt);
 
     for (i = 0; i < princ->n_key_data; ++i) {
 	krb5_key_data *k = &princ->key_data[i];
 	krb5_error_code ret;
-	char *e_string, *s_string;
+	char *e_string, *s_string, *salt;
 
 	ret = krb5_enctype_to_string (context,
 				      k->key_data_type[0],
@@ -159,10 +179,21 @@ print_entry_long(kadm5_principal_ent_t princ)
 	if (ret)
 	    asprintf (&s_string, "unknown(%d)", k->key_data_type[1]);
 
-	printf ("%s%s(%s)", (i != 0) ? ", " : "", e_string, s_string);
+	if (cmp_salt(&def_salt, k) == 0)
+	    salt = strdup("");
+	else if(k->key_data_length[1] == 0)
+	    salt = strdup("()");
+	else
+	    asprintf (&salt, "(%.*s)", k->key_data_length[1],
+		      (char *)k->key_data_contents[1]);
+
+
+	printf ("%s%s(%s%s)", (i != 0) ? ", " : "", e_string, s_string, salt);
 	free (e_string);
 	free (s_string);
+	free (salt);
     }
+    krb5_free_salt (context, def_salt);
     printf("\n\n");
 }
 
@@ -190,37 +221,49 @@ do_get_entry(krb5_principal principal, void *data)
     return 0;
 }
 
-int
-get_entry(int argc, char **argv)
+static int
+getit(const char *name, int terse_flag, int argc, char **argv)
 {
     int i;
     krb5_error_code ret;
     struct get_entry_data data;
     struct getargs args[] = {
 	{ "long",	'l',	arg_flag,	NULL, "long format" },
+	{ "short",	's',	arg_flag,	NULL, "short format" },
 	{ "terse",	't',	arg_flag,	NULL, "terse format" },
     };
     int num_args = sizeof(args) / sizeof(args[0]);
     int optind = 0;
-    int long_flag = 0;
-    int terse_flag = 0;
+    int long_flag = -1;
+    int short_flag = -1;
     
     args[0].value = &long_flag;
-    args[1].value = &terse_flag;
+    args[1].value = &short_flag;
+    args[2].value = &terse_flag;
+
     if(getarg(args, num_args, argc, argv, &optind))
 	goto usage;
     if(optind == argc)
 	goto usage;
 
+    if(long_flag == -1 && (short_flag == 1 || terse_flag == 1))
+	long_flag = 0;
+    if(short_flag == -1 && (long_flag == 1 || terse_flag == 1))
+	short_flag = 0;
+    if(terse_flag == -1 && (long_flag == 1 || short_flag == 1))
+	terse_flag = 0;
+    if(long_flag == 0 && short_flag == 0 && terse_flag == 0)
+	short_flag = 1;
+
     if(long_flag) {
 	data.format = print_entry_long;
 	data.header = NULL;
+    } else if(short_flag){
+	data.format = print_entry_short;
+	data.header = print_header_short;
     } else if(terse_flag) {
 	data.format = print_entry_terse;
 	data.header = NULL;
-    } else {
-	data.format = print_entry_short;
-	data.header = print_header_short;
     }
 
     argc -= optind;
@@ -230,21 +273,18 @@ get_entry(int argc, char **argv)
 	ret = foreach_principal(argv[i], do_get_entry, &data);
     return 0;
 usage:
-    arg_printusage (args, num_args, "get", "principal...");
+    arg_printusage (args, num_args, name, "principal...");
     return 0;
 }
 
 int
-list_princs(int argc, char **argv)
+get_entry(int argc, char **argv)
 {
-    int i;
-    krb5_error_code ret;
-    struct get_entry_data data;
+    return getit("get", 0, argc, argv);
+}
 
-    data.format = print_entry_terse;
-    data.header = NULL;
-    
-    for(i = 1; i < argc; i++)
-	ret = foreach_principal(argv[i], do_get_entry, &data);
-    return 0;
+int
+list_princs(int argc, char **argv)
+{
+    return getit("list", 1, argc, argv);
 }