summaryrefslogtreecommitdiffstats
path: root/doc/wks.texi
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2018-12-04 15:27:19 +0100
committerWerner Koch <wk@gnupg.org>2018-12-04 15:31:41 +0100
commitba46a359b9d6549b74ec8401ea39bad434d87564 (patch)
tree119f6eecb9dfb04ccef6f355f930234d832e4742 /doc/wks.texi
parentgpg: New list-option "show-only-fpr-mbox". (diff)
downloadgnupg2-ba46a359b9d6549b74ec8401ea39bad434d87564.tar.xz
gnupg2-ba46a359b9d6549b74ec8401ea39bad434d87564.zip
wks: Allow reading of --install-key arguments from stdin.
* tools/wks-util.c (install_key_from_spec_file): New. (wks_cmd_install_key): Call it. * tools/gpg-wks-client.c (main): Allow --install-key w/o arguments. * tools/gpg-wks-server.c (main): Ditto. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'doc/wks.texi')
-rw-r--r--doc/wks.texi11
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/wks.texi b/doc/wks.texi
index 021fe5bbb..a0b2a34b9 100644
--- a/doc/wks.texi
+++ b/doc/wks.texi
@@ -95,8 +95,11 @@ local directory (see option @option{-C}) reflecting the structure of a
WKD. The arguments are a file with the keyblock and the user-id to
install. If the first argument resembles a fingerprint the key is
taken from the current keyring; to force the use of a file, prefix the
-first argument with "./". The command @option{--remove-key} removes a
-key from that directory, its only argument is a user-id.
+first argument with "./". If no arguments are given the parameters
+are read from stdin; the expected format are lines with the
+fingerprint and the mailbox separated by a space. The command
+@option{--remove-key} removes a key from that directory, its only
+argument is a user-id.
@command{gpg-wks-client} is not commonly invoked directly and thus it
is not installed in the bin directory. Here is an example how it can
@@ -280,7 +283,9 @@ The command @option{--install-key} manually installs a key into the
WKD. The arguments are a file with the keyblock and the user-id to
install. If the first argument resembles a fingerprint the key is
taken from the current keyring; to force the use of a file, prefix the
-first argument with "./".
+first argument with "./". If no arguments are given the parameters
+are read from stdin; the expected format are lines with the
+fingerprint and the mailbox separated by a space.
The command @option{--remove-key} uninstalls a key from the WKD. The
process returns success in this case; to also print a diagnostic, use