diff options
Diffstat (limited to 'dirmngr/dirmngr.c')
| -rw-r--r-- | dirmngr/dirmngr.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 875a42442..8424c4aca 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -1812,11 +1812,17 @@ static void reread_configuration (void) { gpgrt_argparse_t pargs; + char *twopart; int dummy; if (!opt.config_filename) return; /* No config file. */ + twopart = strconcat (DIRMNGR_NAME EXTSEP_S "conf" PATHSEP_S, + opt.config_filename, NULL); + if (!twopart) + return; /* Out of core. */ + parse_rereadable_options (NULL, 1); /* Start from the default values. */ memset (&pargs, 0, sizeof pargs); @@ -1825,7 +1831,7 @@ reread_configuration (void) pargs.flags = (ARGPARSE_FLAG_KEEP |ARGPARSE_FLAG_SYS |ARGPARSE_FLAG_USER); - while (gpgrt_argparser (&pargs, opts, DIRMNGR_NAME EXTSEP_S "conf") ) + while (gpgrt_argparser (&pargs, opts, twopart)) { if (pargs.r_opt == ARGPARSE_CONFFILE) { @@ -1838,7 +1844,7 @@ reread_configuration (void) parse_rereadable_options (&pargs, 1); } gpgrt_argparse (NULL, &pargs, NULL); /* Release internal state. */ - + xfree (twopart); post_option_parsing (); } |