krb5 commit: Fix kadmin_getpol format string

Greg Hudson ghudson at MIT.EDU
Fri Mar 15 02:32:16 EDT 2013


https://github.com/krb5/krb5/commit/7ed54bc66d81790ab33c056baf9ad826a646ee94
commit 7ed54bc66d81790ab33c056baf9ad826a646ee94
Author: Greg Hudson <ghudson at mit.edu>
Date:   Fri Mar 15 02:13:22 2013 -0400

    Fix kadmin_getpol format string
    
    Commit 0780e46fc13dbafa177525164997cd204cc50b51 matched a %ld format
    string with the integer 0, which is an int rather than a long.  Just
    put 0 in the format string instead.  Noted by David Benjamin
    <davidben at mit.edu>.

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

diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
index 151f316..6f6a8ba 100644
--- a/src/kadmin/cli/kadmin.c
+++ b/src/kadmin/cli/kadmin.c
@@ -1731,10 +1731,10 @@ kadmin_getpol(int argc, char *argv[])
             printf(_("Allowed key/salt types: %s\n"), policy.allowed_keysalts);
     } else {
         /* Output 0 where we used to output policy_refcnt. */
-        printf("\"%s\"\t%ld\t%ld\t%ld\t%ld\t%ld\t%ld\t%lu\t%ld\t%ld\t%s\n",
+        printf("\"%s\"\t%ld\t%ld\t%ld\t%ld\t%ld\t0\t%lu\t%ld\t%ld\t%s\n",
                policy.policy, policy.pw_max_life, policy.pw_min_life,
                policy.pw_min_length, policy.pw_min_classes,
-               policy.pw_history_num, 0, (unsigned long)policy.pw_max_fail,
+               policy.pw_history_num, (unsigned long)policy.pw_max_fail,
                (long)policy.pw_failcnt_interval,
                (long)policy.pw_lockout_duration,
                (policy.allowed_keysalts == NULL) ? "-" :


More information about the cvs-krb5 mailing list