From bcb0f136e94d1e3a533a14aa56765cee48dd033d Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Tue, 19 Dec 2006 21:10:19 +0000 Subject: [PATCH] pull up r18955 from trunk r18955@cathode-dark-space: rra | 2006-12-15 21:08:40 -0500 ticket: new subject: Add -clearpolicy to kadmin addprinc usage Component: krb5-admin Version_Reported: 1.4.4 Target_Version: 1.6 Tags: pullup Add -clearpolicy to the usage message returned by kadmin when one types addprinc without any arguments. ticket: 5125 version_fixed: 1.6 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@18981 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/cli/kadmin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c index a2a600256..3603df669 100644 --- a/src/kadmin/cli/kadmin.c +++ b/src/kadmin/cli/kadmin.c @@ -1095,7 +1095,7 @@ kadmin_addprinc_usage(func) { fprintf(stderr, "usage: %s [options] principal\n", func); fprintf(stderr, "\toptions are:\n"); - fprintf(stderr, "\t\t[-x db_princ_args]* [-expire expdate] [-pwexpire pwexpdate] [-maxlife maxtixlife]\n\t\t[-kvno kvno] [-policy policy] [-randkey] [-pw password]\n\t\t[-maxrenewlife maxrenewlife]\n\t\t[-e keysaltlist]\n\t\t[{+|-}attribute]\n"); + fprintf(stderr, "\t\t[-x db_princ_args]* [-expire expdate] [-pwexpire pwexpdate] [-maxlife maxtixlife]\n\t\t[-kvno kvno] [-policy policy] [-clearpolicy] [-randkey]\n\t\t[-pw password] [-maxrenewlife maxrenewlife]\n\t\t[-e keysaltlist]\n\t\t[{+|-}attribute]\n"); fprintf(stderr, "\tattributes are:\n"); fprintf(stderr, "%s%s%s", "\t\tallow_postdated allow_forwardable allow_tgs_req allow_renewable\n", -- 2.26.2