[29392] in CVS-changelog-for-Kerberos-V5
krb5 commit: Improve kadmin time interval output consistency
daemon@ATHENA.MIT.EDU (Greg Hudson)
Mon Apr 25 21:10:20 2016
Date: Mon, 25 Apr 2016 21:10:16 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201604260110.u3Q1AGuI022934@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/7a8e4d3ce6091e806c9ea1049682046635b46e29
commit 7a8e4d3ce6091e806c9ea1049682046635b46e29
Author: Greg Hudson <ghudson@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);
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
