diff options
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/gpgsm.c | 2 | ||||
| -rw-r--r-- | sm/keydb.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 5c13e2f41..492f63eab 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1707,7 +1707,7 @@ main ( int argc, char **argv) filelist[0] = make_filename (gnupg_datadir (),"com-certs.pem", NULL); filelist[1] = NULL; - if (!access (filelist[0], F_OK)) + if (!gnupg_access (filelist[0], F_OK)) { log_info (_("importing common certificates '%s'\n"), filelist[0]); diff --git a/sm/keydb.c b/sm/keydb.c index d85679a3b..45e932aa3 100644 --- a/sm/keydb.c +++ b/sm/keydb.c @@ -113,6 +113,7 @@ try_make_homedir (const char *fname) static gpg_error_t maybe_create_keybox (char *filename, int force, int *r_created) { + gpg_err_code_t ec; dotlock_t lockhd = NULL; FILE *fp; int rc; @@ -124,8 +125,8 @@ maybe_create_keybox (char *filename, int force, int *r_created) *r_created = 0; /* A quick test whether the filename already exists. */ - if (!access (filename, F_OK)) - return !access (filename, R_OK)? 0 : gpg_error (GPG_ERR_EACCES); + if (!gnupg_access (filename, F_OK)) + return !gnupg_access (filename, R_OK)? 0 : gpg_error (GPG_ERR_EACCES); /* If we don't want to create a new file at all, there is no need to go any further - bail out right here. */ @@ -160,9 +161,9 @@ maybe_create_keybox (char *filename, int force, int *r_created) tried = 1; try_make_homedir (filename); } - if (access (filename, F_OK)) + if ((ec = gnupg_access (filename, F_OK))) { - rc = gpg_error_from_syserror (); + rc = gpg_error (ec); *last_slash_in_filename = save_slash; goto leave; } |