diff options
| author | Werner Koch <wk@gnupg.org> | 2008-12-05 13:01:01 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2008-12-05 13:01:01 +0100 |
| commit | 041c764672705c842b43f4978b4a4dfd32a5977b (patch) | |
| tree | 915666ed83407455549136af3b404b2238a8b79e /tools/gpgconf-comp.c | |
| parent | Translate the oktext (yes/no). (diff) | |
| download | gnupg2-041c764672705c842b43f4978b4a4dfd32a5977b.tar.xz gnupg2-041c764672705c842b43f4978b4a4dfd32a5977b.zip | |
Add option --card-timeout.
Add a new attribyte to app-openpgp.c
Fix two portability bugs.
Have gpg-connect-agent autostart gpg-agent on W32.
Diffstat (limited to '')
| -rw-r--r-- | tools/gpgconf-comp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index f7c8af1d7..1084bda72 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -599,15 +599,15 @@ static gc_option_t gc_options_scdaemon[] = { "pcsc-driver", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED, "gnupg", "|NAME|use NAME as PC/SC driver", GC_ARG_TYPE_STRING, GC_BACKEND_SCDAEMON }, - { "disable-opensc", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT, - "gnupg", "do not use the OpenSC layer", - GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON }, { "disable-ccid", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT, "gnupg", "do not use the internal CCID driver", GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON }, { "disable-keypad", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC, "gnupg", "do not use a reader's keypad", GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON }, + { "card-timeout", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC, + "gnupg", "|N|disconnect the card after N seconds of inactivity", + GC_ARG_TYPE_UINT32, GC_BACKEND_SCDAEMON }, { "Debug", GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED, @@ -616,7 +616,7 @@ static gc_option_t gc_options_scdaemon[] = "gnupg", "|LEVEL|set the debugging level to LEVEL", GC_ARG_TYPE_STRING, GC_BACKEND_SCDAEMON }, { "log-file", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED, - "gnupg", N_("|FILE|write server mode logs to FILE"), + "gnupg", N_("|FILE|write a log to FILE"), GC_ARG_TYPE_FILENAME, GC_BACKEND_SCDAEMON }, { "Security", |