aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2020-02-25 14:18:55 +0000
committerWerner Koch <[email protected]>2020-02-25 14:18:55 +0000
commit79f2318aa5c54c57220aa73251635d21cee0ccfa (patch)
tree0f9db598ec985033a543cb0e0f4070062048b85d
parentgpg: Re-add checking of config file permissions. (diff)
downloadgnupg-79f2318aa5c54c57220aa73251635d21cee0ccfa.tar.gz
gnupg-79f2318aa5c54c57220aa73251635d21cee0ccfa.zip
gpg: Re-enable versioned config files
* g10/gpg.c (main): Use ARGPARSE_FLAG_USERVERS. Signed-off-by: Werner Koch <[email protected]>
-rw-r--r--g10/gpg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index e02b80b76..057c19190 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2513,8 +2513,8 @@ main (int argc, char **argv)
pargs.flags |= (ARGPARSE_FLAG_RESET
| ARGPARSE_FLAG_KEEP
| ARGPARSE_FLAG_SYS
- | ARGPARSE_FLAG_USER);
- /* FIXME: Add an option to allow for version specific config files. */
+ | ARGPARSE_FLAG_USER
+ | ARGPARSE_FLAG_USERVERS);
/* By this point we have a homedir, and cannot change it. */
check_permissions (gnupg_homedir (), 0);