diff options
| author | Russ Allbery <eagle@eyrie.org> | 2014-07-15 20:48:35 -0700 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2014-07-15 21:11:07 -0700 |
| commit | 4ad7d55ed55b83d7b0df6a408e3c6931725c4a99 (patch) | |
| tree | fbfe73745bb49804cb463044261be3baea1725ac /server | |
| parent | c2112bf049d193c677335c94b477eb5cadb403ed (diff) | |
Fix wallet-backend parsing of expires
Fix wallet-backend parsing of the expires command to expect only one
argument as the expiration. This was correctly documented in the
wallet client man page, but not in wallet-backend, and it accepted two
arguments (a date and time). However, Wallet::Server did not and
would just ignore the time. Now wallet-backend correctly requires the
date and time be passed as a single argument.
Change-Id: I8e51a576ea8781502f4eb983462ceca867b002be
Reviewed-on: https://gerrit.stanford.edu/1556
Reviewed-by: Russ Allbery <rra@stanford.edu>
Tested-by: Russ Allbery <rra@stanford.edu>
Diffstat (limited to 'server')
| -rwxr-xr-x | server/wallet-backend | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/server/wallet-backend b/server/wallet-backend index a97c8ce..a2e6e6f 100755 --- a/server/wallet-backend +++ b/server/wallet-backend @@ -216,7 +216,7 @@ sub command { check_args (2, 2, [], @args); $server->destroy (@args) or failure ($server->error, @_); } elsif ($command eq 'expires') { - check_args (2, 4, [], @args); + check_args (2, 3, [], @args); if (@args > 2) { $server->expires (@args) or failure ($server->error, @_); } else { @@ -490,9 +490,10 @@ identified by <type> and <name>, or C<No expiration set> if none is set. The expiration will be displayed in seconds since epoch. If <date> is given, sets the expiration on the object identified by <type> -and <name> to <date> and (if given) <time>. <date> must be in the format -C<YYYY-MM-DD> and <time> in the format C<HH:MM:SS>. If <date> is the -empty string, clears the expiration of the object. +and <name> to <date> and (if given) <time>. <date> and <time> must be in +some format that can be parsed by the Perl Date::Parse module. Most +common formats are supported; if in doubt, use C<YYYY-MM-DD HH:MM:SS>. If +<date> is the empty string, clears the expiration of the object. Currently, the expiration of an object is not used. |