summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2021-04-19 11:33:19 +0200
committerWerner Koch <wk@gnupg.org>2021-04-19 11:33:19 +0200
commitd13c5bc244ce1daed285424d920171fc2bcd7290 (patch)
tree510074df1671ad043855a00c347ea922a937c093 /po
parentgpg: Lookup a missing public key of the current card via LDAP. (diff)
downloadgnupg2-d13c5bc244ce1daed285424d920171fc2bcd7290.tar.xz
gnupg2-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 'po')
-rw-r--r--po/POTFILES.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 61b6f2d0a..2658660e0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,6 +26,7 @@ common/helpfile.c
common/gettime.c
common/ksba-io-support.c
common/ttyio.c
+common/comopt.c
common/utf8conv.c
common/dotlock.c