krb5 commit: Improve kadmin time interval output consistency

Greg Hudson ghudson at mit.edu
Mon Apr 25 21:10:16 EDT 2016


https://github.com/krb5/krb5/commit/7a8e4d3ce6091e806c9ea1049682046635b46e29
commit 7a8e4d3ce6091e806c9ea1049682046635b46e29
Author: Greg Hudson <ghudson at mit.edu>
Date:   Mon Apr 25 11:40:47 2016 -0400

    Improve kadmin time interval output consistency
    
    Use strdur() to output the maximum and minimum password life for
    policies, and output "[never]" instead of "[none]" for a zero password
    expiration date for consistency with other dates.
    
    ticket: 8393

 src/kadmin/cli/kadmin.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
index 62786b1..45741c7 100644
--- a/src/kadmin/cli/kadmin.c
+++ b/src/kadmin/cli/kadmin.c
@@ -1431,7 +1431,7 @@ kadmin_getprinc(int argc, char *argv[])
                strdate(dprinc.last_pwd_change) : _("[never]"));
         printf(_("Password expiration date: %s\n"),
                dprinc.pw_expiration ?
-               strdate(dprinc.pw_expiration) : _("[none]"));
+               strdate(dprinc.pw_expiration) : _("[never]"));
         printf(_("Maximum ticket life: %s\n"), strdur(dprinc.max_life));
         printf(_("Maximum renewable life: %s\n"),
                strdur(dprinc.max_renewable_life));
@@ -1732,8 +1732,8 @@ kadmin_getpol(int argc, char *argv[])
     }
     if (argc == 2) {
         printf(_("Policy: %s\n"), policy.policy);
-        printf(_("Maximum password life: %ld\n"), policy.pw_max_life);
-        printf(_("Minimum password life: %ld\n"), policy.pw_min_life);
+        printf(_("Maximum password life: %s\n"), strdur(policy.pw_max_life));
+        printf(_("Minimum password life: %s\n"), strdur(policy.pw_min_life));
         printf(_("Minimum password length: %ld\n"), policy.pw_min_length);
         printf(_("Minimum number of password character classes: %ld\n"),
                policy.pw_min_classes);


More information about the cvs-krb5 mailing list