security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-12 22:11:29 +02:00
Code Activity

gpgconf: Take care of --homedir when reading/updating options.

Browse Source 
* tools/gpgconf-comp.c (gc_component_check_options): Take care of
--homedir.
(retrieve_options_from_program): Ditto.
--

Note that due to the large changes in master we could not backport the
patch from there.

GnuPG-bug-id: 4882
This commit is contained in:
Werner Koch 2020-03-19 13:01:42 +01:00
parent 8aec6d6fd8
commit b92860a8b9
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/gpgconf-comp.c
View File

@ -1708,7 +1708,7 @@ gc_component_check_options (int component, estream_t out, const char *conf_file)
gc_backend_t backend; gc_backend_t backend;
gc_option_t *option; gc_option_t *option;
const char *pgmname; const char *pgmname;
const char *argv[4]; const char *argv[6];
int i; int i;
pid_t pid; pid_t pid;
int exitcode; int exitcode;
@ -1740,6 +1740,14 @@ gc_component_check_options (int component, estream_t out, const char *conf_file)
pgmname = gnupg_module_name (gc_backend[backend].module_name); pgmname = gnupg_module_name (gc_backend[backend].module_name);
i = 0; i = 0;
if (!gnupg_default_homedir_p ()
&& backend != GC_BACKEND_ANY
&& backend != GC_BACKEND_DIRMNGR_LDAP_SERVER_LIST
&& backend != GC_BACKEND_PINENTRY)
{
argv[i++] = "--homedir";
argv[i++] = gnupg_homedir ();
}
if (conf_file) if (conf_file)
{ {
argv[i++] = "--options"; argv[i++] = "--options";
@ -2081,7 +2089,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend,
{ {
gpg_error_t err; gpg_error_t err;
const char *pgmname; const char *pgmname;
const char *argv[2]; const char *argv[4];
estream_t outfp; estream_t outfp;
int exitcode; int exitcode;
pid_t pid; pid_t pid;
@ -2090,12 +2098,22 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend,
ssize_t length; ssize_t length;
estream_t config; estream_t config;
char *config_filename; char *config_filename;
int i;
pgmname = (gc_backend[backend].module_name pgmname = (gc_backend[backend].module_name
? gnupg_module_name (gc_backend[backend].module_name) ? gnupg_module_name (gc_backend[backend].module_name)
: gc_backend[backend].program ); : gc_backend[backend].program );
argv[0] = "--gpgconf-list"; i = 0;
argv[1] = NULL; if (!gnupg_default_homedir_p ()
&& backend != GC_BACKEND_ANY
&& backend != GC_BACKEND_DIRMNGR_LDAP_SERVER_LIST
&& backend != GC_BACKEND_PINENTRY)
{
argv[i++] = "--homedir";
argv[i++] = gnupg_homedir ();
}
argv[i++] = "--gpgconf-list";
argv[i++] = NULL;
if (only_installed && access (pgmname, X_OK)) if (only_installed && access (pgmname, X_OK))
{ {