diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpg-wks-server.c | 19 | ||||
| -rw-r--r-- | tools/gpgconf-comp.c | 4 | ||||
| -rw-r--r-- | tools/wks-util.c | 5 |
3 files changed, 15 insertions, 13 deletions
diff --git a/tools/gpg-wks-server.c b/tools/gpg-wks-server.c index 8cdbfaf36..6d18f499f 100644 --- a/tools/gpg-wks-server.c +++ b/tools/gpg-wks-server.c @@ -1177,7 +1177,7 @@ process_new_key (server_ctx_t ctx, estream_t key) goto leave; } - if (access (dname, W_OK)) + if (gnupg_access (dname, W_OK)) { log_info ("skipping address '%s': Domain not configured\n", sl->mbox); continue; @@ -1454,7 +1454,7 @@ check_and_publish (server_ctx_t ctx, const char *address, const char *nonce) err = gpg_error_from_syserror (); goto leave; } - if (!access (fnewname, W_OK)) + if (!gnupg_access (fnewname, W_OK)) { /* Yes, we have a dane directory. */ s = strchr (address, '@'); @@ -1790,7 +1790,7 @@ command_list_domains (void) { "pending", "-rwx" }, { "hu", "-rwxr-xr-x" } }; - + gpg_err_code_t ec; gpg_error_t err; strlist_t domaindirs; strlist_t sl; @@ -1827,9 +1827,9 @@ command_list_domains (void) err = gpg_error_from_syserror (); goto leave; } - if (access (fname, W_OK)) + if ((ec = gnupg_access (fname, W_OK))) { - err = gpg_error_from_syserror (); + err = gpg_error (ec); if (gpg_err_code (err) == GPG_ERR_ENOENT) { if (gnupg_mkdir (fname, requireddirs[i].perm)) @@ -1857,9 +1857,9 @@ command_list_domains (void) err = gpg_error_from_syserror (); goto leave; } - if (access (fname, F_OK)) + if ((ec = gnupg_access (fname, F_OK))) { - err = gpg_error_from_syserror (); + err = gpg_error (ec); if (gpg_err_code (err) == GPG_ERR_ENOENT) log_error ("domain %s: submission address not configured\n", domain); @@ -1936,6 +1936,7 @@ command_cron (void) static gpg_error_t command_check_key (const char *userid) { + gpg_err_code_t ec; gpg_error_t err; char *addrspec = NULL; char *fname = NULL; @@ -1944,9 +1945,9 @@ command_check_key (const char *userid) if (err) goto leave; - if (access (fname, R_OK)) + if ((ec = gnupg_access (fname, R_OK))) { - err = gpg_error_from_syserror (); + err = gpg_error (ec); if (opt_with_file) es_printf ("%s n %s\n", addrspec, fname); if (gpg_err_code (err) == GPG_ERR_ENOENT) diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 135d8004d..ce21081f9 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -2115,7 +2115,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend, argv[i++] = "--gpgconf-list"; argv[i++] = NULL; - if (only_installed && access (pgmname, X_OK)) + if (only_installed && gnupg_access (pgmname, X_OK)) { return; /* The component is not installed. */ } @@ -4055,7 +4055,7 @@ gc_apply_profile (const char *fname) * is installed and use that instead of the given file name. */ fname_buffer = xstrconcat (gnupg_datadir (), DIRSEP_S, fname, ".prf", NULL); - if (!access (fname_buffer, F_OK)) + if (!gnupg_access (fname_buffer, F_OK)) fname = fname_buffer; } diff --git a/tools/wks-util.c b/tools/wks-util.c index 52c89bae4..9aaa7aaf5 100644 --- a/tools/wks-util.c +++ b/tools/wks-util.c @@ -873,6 +873,7 @@ wks_compute_hu_fname (char **r_fname, const char *addrspec) static gpg_error_t ensure_policy_file (const char *addrspec) { + gpg_err_code_t ec; gpg_error_t err; const char *domain; char *fname; @@ -890,12 +891,12 @@ ensure_policy_file (const char *addrspec) goto leave; /* First a quick check whether it already exists. */ - if (!access (fname, F_OK)) + if (!(ec = gnupg_access (fname, F_OK))) { err = 0; /* File already exists. */ goto leave; } - err = gpg_error_from_syserror (); + err = gpg_error (ec); if (gpg_err_code (err) == GPG_ERR_ENOENT) err = 0; else |