diff options
| author | Barry Jaspan <bjaspan@mit.edu> | 1996-08-11 20:30:33 +0000 |
|---|---|---|
| committer | Barry Jaspan <bjaspan@mit.edu> | 1996-08-11 20:30:33 +0000 |
| commit | a4d3caf7303cc589ce36c63651cd24bd6dde1589 (patch) | |
| tree | 31fef465291bc54b7f38ac13642f1861bc2412f7 | |
| parent | 6b81a8531cc262433af37f861f7c10c651a43d1b (diff) | |
| download | krb5-a4d3caf7303cc589ce36c63651cd24bd6dde1589.tar.gz krb5-a4d3caf7303cc589ce36c63651cd24bd6dde1589.tar.xz krb5-a4d3caf7303cc589ce36c63651cd24bd6dde1589.zip | |
* keytab.c: reset static global "quiet" each time; don't print
whoami on normal status messages
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8923 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/kadmin/cli/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/cli/keytab.c | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog index 8b5aa4551..053798987 100644 --- a/src/kadmin/cli/ChangeLog +++ b/src/kadmin/cli/ChangeLog @@ -1,3 +1,8 @@ +Sun Aug 11 16:29:27 1996 Barry Jaspan <bjaspan@mit.edu> + + * keytab.c: reset static global "quiet" each time; don't print + whoami on normal status messages + Tue Aug 6 15:18:49 1996 Barry Jaspan <bjaspan@mit.edu> * kadmin_ct.ct: get_{principals,policies} -> list_*; remove diff --git a/src/kadmin/cli/keytab.c b/src/kadmin/cli/keytab.c index dd8242e01..338206356 100644 --- a/src/kadmin/cli/keytab.c +++ b/src/kadmin/cli/keytab.c @@ -93,6 +93,7 @@ void kadmin_keytab_add(int argc, char **argv) int code, num, i; argc--; argv++; + quiet = 0; while (argc) { if (strncmp(*argv, "-k", 2) == 0) { argc--; argv++; @@ -153,6 +154,7 @@ void kadmin_keytab_remove(int argc, char **argv) int code; argc--; argv++; + quiet = 0; while (argc) { if (strncmp(*argv, "-k", 2) == 0) { argc--; argv++; @@ -238,9 +240,9 @@ int add_principal(void *handle, char *keytab_str, krb5_keytab keytab, } if (!quiet) - printf("%s: Entry for principal %s with kvno %d, " + printf("Entry for principal %s with kvno %d, " "encryption type %s added to keytab %s.\n", - whoami, princ_str, princ_rec.kvno, + princ_str, princ_rec.kvno, etype_string(keys[i].enctype), keytab_str); } @@ -358,8 +360,8 @@ int remove_principal(char *keytab_str, krb5_keytab keytab, char did_something++; if (!quiet) - printf("%s: Entry for principal %s with kvno %d " - "removed from keytab %s.\n", whoami, + printf("Entry for principal %s with kvno %d " + "removed from keytab %s.\n", princ_str, entry.vno, keytab_str); } krb5_kt_free_entry(context, &entry); |