summaryrefslogtreecommitdiffstats
path: root/tools/gpgconf-comp.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2004-05-03 15:37:38 +0200
committerWerner Koch <wk@gnupg.org>2004-05-03 15:37:38 +0200
commit30bbef1a285929422bd99d648592e146cd5418ae (patch)
treecc826fb8208072461b4c1f884b979204872e0f50 /tools/gpgconf-comp.c
parent(main) <gpgconf>: Use gpg.conf and not /dev/null as (diff)
downloadgnupg2-30bbef1a285929422bd99d648592e146cd5418ae.tar.xz
gnupg2-30bbef1a285929422bd99d648592e146cd5418ae.zip
* gpg-agent.c: Remove help texts for options lile --lc-ctype.
(main): New option --allow-mark-trusted. * trustlist.c (agent_marktrusted): Use it here. * gpg-agent.texi (Agent Options): Add --allow-mark-trusted. * gpgconf-comp.c: Add --allow-mark-trusted for the gpg-agent.
Diffstat (limited to '')
-rw-r--r--tools/gpgconf-comp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index ce16ce7f4..735e87c86 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -469,6 +469,9 @@ static gc_option_t gc_options_gpg_agent[] =
{ "ignore-cache-for-signing", GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
"gnupg", "do not use the PIN cache when signing",
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
+ { "allow-mark-trusted", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
+ "gnupg", "allow clients to mark keys as \"trusted\"",
+ GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
{ "no-grab", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT,
"gnupg", "do not grab keyboard and mouse",
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },