From: Ben Kaduk Date: Fri, 6 Jul 2012 22:56:57 +0000 (-0400) Subject: Revert "Document absolute times for 'kinit -s'" X-Git-Tag: krb5-1.11-alpha1~441 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc345d84e0b3c56a057a92ca76216d8af133b5f9;p=thirdparty%2Fkrb5.git Revert "Document absolute times for 'kinit -s'" This reverts commit 20f85a81151f69689e3c060e89852687eb6c5a3c. The ability of 'kinit -s' to accept an absolute time is intentionally undocumented and remains only for backwards compatibility. Leave a comment in the source to this effect, for future generations. --- diff --git a/doc/rst_source/krb_users/user_commands/kinit.rst b/doc/rst_source/krb_users/user_commands/kinit.rst index a07962d4d3..6143c95e47 100644 --- a/doc/rst_source/krb_users/user_commands/kinit.rst +++ b/doc/rst_source/krb_users/user_commands/kinit.rst @@ -73,11 +73,7 @@ OPTIONS validation before use. *start_time* specifies the duration of the delay before the ticket - can become valid using the same time format as the **-l** option; - alternately, an absolute time may be specified in one of several - forms, including *[[yy]yymmdd]hhmm[ss]* (and some variants with - *.* or *:* as a field separator), and some locale-specific time - specifications. + can become valid using the same time format as the **-l** option. **-r** *renewable_life* requests renewable tickets, with a total lifetime of diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c index dcec9b7662..256f165fe9 100644 --- a/src/clients/kinit/kinit.c +++ b/src/clients/kinit/kinit.c @@ -330,6 +330,8 @@ parse_options(argc, argv, opts) case 's': code = krb5_string_to_deltat(optarg, &opts->starttime); if (code != 0 || opts->starttime == 0) { + /* Parse as an absolute time; intentionally undocumented + * but left for backwards compatibility. */ krb5_timestamp abs_starttime; code = krb5_string_to_timestamp(optarg, &abs_starttime);