aboutsummaryrefslogtreecommitdiffstats
path: root/doc/gpgsm.texi
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2021-04-19 09:33:19 +0000
committerWerner Koch <[email protected]>2021-04-19 09:33:19 +0000
commitd13c5bc244ce1daed285424d920171fc2bcd7290 (patch)
tree510074df1671ad043855a00c347ea922a937c093 /doc/gpgsm.texi
parentgpg: Lookup a missing public key of the current card via LDAP. (diff)
downloadgnupg-d13c5bc244ce1daed285424d920171fc2bcd7290.tar.gz
gnupg-d13c5bc244ce1daed285424d920171fc2bcd7290.zip
gpg,gpgsm: Move use-keyboxd to the new conf file common.conf
* common/comopt.c, common/comopt.h: New. * common/Makefile.am: Add them. * g10/gpg.c: Include comopt.h. (main): Also parse common.conf. * sm/gpgsm.c: Include comopt.h. (main): Set a flag for the --no-logfile option. Parse common.conf. * tools/gpgconf-comp.c (known_options_gpg): Remove "use-keyboxd", add pseudo option "use_keyboxd". (known_pseudo_options_gpg): Add pseudo option "use_keyboxd". (known_options_gpgsm): Remove "use-keyboxd". * tests/openpgp/defs.scm (create-gpghome): Create common.conf. * doc/examples/common.conf: New. -- Note that --use-keybox still works but prints a warning. We will eventually remove this option becuase it was marked as an experimental feature anyway. It would be too confusing if gpg and gpgsm use different key storages. Further, other components (e.g. dirmngr or gpg-wks-client) which call gpg or gpgsm need to be aware that the keyboxd is used and pass that option on the command line. Now that common.conf is always read (even if --no-options is used) those tools will work instantly.
Diffstat (limited to 'doc/gpgsm.texi')
-rw-r--r--doc/gpgsm.texi5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 50a2595ae..886521076 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -853,6 +853,11 @@ may not be entered and the option may not be abbreviated. This default
name may be changed on the command line (@pxref{gpgsm-option --options}).
You should backup this file.
+@item common.conf
+@efindex common.conf
+This is an optional configuration file read by @command{gpgsm} on
+startup. It may contain options pertaining to all components of
+GnuPG. Its current main use is for the "use-keyboxd" option.
@item policies.txt
@efindex policies.txt