security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-05 12:31:50 +01:00
Code Activity

gpgconf: Yet another fix for --apply-profile.

Browse Source 
* tools/gpgconf.c (main): Use gnupg_homedir instead of
default_homedir.  Check for existance of the directory.
--

Fixes-commit: 7d95f2e7e7a09e3d433d449b117e3470f9dd38c7
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2020-11-12 13:09:32 +01:00
parent 23f1fc766a
commit e546cc78b7
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/gpgconf.c
View File

@ -805,16 +805,16 @@ main (int argc, char **argv)
es_putc ('\n', es_stderr); es_putc ('\n', es_stderr);
gpgconf_failure (GPG_ERR_USER_2); gpgconf_failure (GPG_ERR_USER_2);
} }
if (!opt.dry_run) if (!opt.dry_run && gnupg_access (gnupg_homedir (), F_OK))
gnupg_maybe_make_homedir (default_homedir (), opt.quiet); gnupg_maybe_make_homedir (gnupg_homedir (), opt.quiet);
gc_component_retrieve_options (-1); gc_component_retrieve_options (-1);
if (gc_process_gpgconf_conf (NULL, 1, 1, NULL)) if (gc_process_gpgconf_conf (NULL, 1, 1, NULL))
gpgconf_failure (0); gpgconf_failure (0);
break; break;
case aApplyProfile: case aApplyProfile:
if (!opt.dry_run) if (!opt.dry_run && gnupg_access (gnupg_homedir (), F_OK))
gnupg_maybe_make_homedir (default_homedir (), opt.quiet); gnupg_maybe_make_homedir (gnupg_homedir (), opt.quiet);
gc_component_retrieve_options (-1); gc_component_retrieve_options (-1);
if (gc_apply_profile (fname)) if (gc_apply_profile (fname))
gpgconf_failure (0); gpgconf_failure (0);