diff options
| author | Werner Koch <wk@gnupg.org> | 2009-03-02 13:32:54 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2009-03-02 13:32:54 +0100 |
| commit | b61b2f542a676b2a3e253a73ccd2a411d1aa956e (patch) | |
| tree | fb843a9778c6d8dadd14123d93258fddd832a64f | |
| parent | Modernized gpg-agent startup instructions (diff) | |
| download | gnupg2-b61b2f542a676b2a3e253a73ccd2a411d1aa956e.tar.xz gnupg2-b61b2f542a676b2a3e253a73ccd2a411d1aa956e.zip | |
Add missing option strings.
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | agent/ChangeLog | 3 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 5 | ||||
| -rw-r--r-- | doc/ChangeLog | 1 | ||||
| -rw-r--r-- | doc/gpg-agent.texi | 4 |
5 files changed, 11 insertions, 3 deletions
@@ -192,6 +192,7 @@ Peter Fales psfales at lucent.com Peter Gutmann pgut001 at cs.auckland.ac.nz Peter Marschall Peter.Marschall at gedos.de Peter Valchev pvalchev at openbsd.org +Petr Uzel petr.uzel at suse cz Phong Nguyen Phong.Nguyen at ens.fr Piotr Krukowiecki piotr at pingu.ii.uj.edu.pl QingLong qinglong at bolizm.ihep.su diff --git a/agent/ChangeLog b/agent/ChangeLog index 8f42b3273..8ae1ffc2e 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,5 +1,8 @@ 2009-03-02 Werner Koch <wk@g10code.com> + * gpg-agent.c: Add missing option strings for "--batch" and + "--homedir". Reported by Petr Uzel. + * protect-tool.c (import_p12_file): Take care of canceled passphrase entry. Fixes bug#1003. (export_p12_file): Ditto. diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 90319d22f..0ab30550c 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -1,6 +1,6 @@ /* gpg-agent.c - The GnuPG Agent * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, - * 2006, 2007 Free Software Foundation, Inc. + * 2006, 2007, 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -141,6 +141,9 @@ static ARGPARSE_OPTS opts[] = { { oDisableScdaemon, "disable-scdaemon", 0, N_("do not use the SCdaemon") }, { oFakedSystemTime, "faked-system-time", 2, "@" }, /* (epoch time) */ + { oBatch, "batch", 0, "@" }, + { oHomedir, "homedir", 2, "@"}, + { oDisplay, "display", 2, "@" }, { oTTYname, "ttyname", 2, "@" }, { oTTYtype, "ttytype", 2, "@" }, diff --git a/doc/ChangeLog b/doc/ChangeLog index 53d7faf27..780d71377 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,6 +1,7 @@ 2009-03-02 Werner Koch <wk@g10code.com> * gpg-agent.texi (Invoking GPG-AGENT): Modernized instructions. + (Agent Options): Fix spelling of option --lc-ctype. 2009-01-12 Werner Koch <wk@g10code.com> diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi index af30a2390..1b27dd593 100644 --- a/doc/gpg-agent.texi +++ b/doc/gpg-agent.texi @@ -433,13 +433,13 @@ default on Windows systems. @item --display @var{string} @itemx --ttyname @var{string} @itemx --ttytype @var{string} -@itemx --lc-type @var{string} +@itemx --lc-ctype @var{string} @itemx --lc-messages @var{string} @itemx --xauthority @var{string} @opindex display @opindex ttyname @opindex ttytype -@opindex lc-type +@opindex lc-ctype @opindex lc-messages @opindex xauthority These options are used with the server mode to pass localization |