diff options
Diffstat (limited to 'dirmngr')
| -rw-r--r-- | dirmngr/dirmngr.c | 12 | ||||
| -rw-r--r-- | dirmngr/http.c | 5 |
2 files changed, 8 insertions, 9 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 9d4fb1474..f5dce811f 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -611,15 +611,9 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) { char *tmpname; - /* Do tilde expansion and print a warning if the file can't be - accessed. */ - tmpname = make_absfilename_try (pargs->r.ret_str, NULL); - if (!tmpname || access (tmpname, F_OK)) - log_info (_("can't access '%s': %s\n"), - tmpname? tmpname : pargs->r.ret_str, - gpg_strerror (gpg_error_from_syserror())); - else - http_register_tls_ca (tmpname); + /* Do tilde expansion and make path absolute. */ + tmpname = make_absfilename (pargs->r.ret_str, NULL); + http_register_tls_ca (tmpname); xfree (tmpname); } break; diff --git a/dirmngr/http.c b/dirmngr/http.c index b74a9ef9a..90682fa46 100644 --- a/dirmngr/http.c +++ b/dirmngr/http.c @@ -495,6 +495,11 @@ http_register_tls_ca (const char *fname) } else { + /* Warn if we can't access right now, but register it anyway in + case it becomes accessible later */ + if (access (fname, F_OK)) + log_info (_("can't access '%s': %s\n"), fname, + gpg_strerror (gpg_error_from_syserror())); sl = add_to_strlist (&tls_ca_certlist, fname); if (*sl->d && !strcmp (sl->d + strlen (sl->d) - 4, ".pem")) sl->flags = 1; |