* 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

diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 8b5aa45510f7ed0fac538827f9ef80c3c522086a..053798987ea412d681f710668ffd731e6553fd82 100644 (file)
--- 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 dd8242e018a2626953c181396bb37c9c2f91e270..338206356dfdd122fed1fe62a6851876c87c4cb5 100644 (file)
--- 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);