diff options
| author | Werner Koch <[email protected]> | 2025-03-05 09:24:14 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2025-03-05 09:24:50 +0000 |
| commit | 41cf76b8c142b1d34aa817744fb6fd0e276c2709 (patch) | |
| tree | 90a2b7dc60b517301480313839f76213c7f042bb /agent | |
| parent | tools: Add envvar GPG_AUTHCODE_SIGN_MODE to disable signing. (diff) | |
| download | gnupg-41cf76b8c142b1d34aa817744fb6fd0e276c2709.tar.gz gnupg-41cf76b8c142b1d34aa817744fb6fd0e276c2709.zip | |
Log the Windows system error code at more places.
* common/asshelp.c (log_libassuan_system_error): New.
* agent/gpg-agent.c (create_server_socket): Use new log function.
(handle_connections): Log system error code for a failed accept.
* dirmngr/dirmngr.c (handle_connections): Ditto.
* kbx/keyboxd.c (handle_connections): Ditto.
* scd/scdaemon.c (handle_connections): Ditto.
* tpm2d/tpm2daemon.c (handle_connections): Ditto.
* dirmngr/dirmngr.c (main): Log system error code for a failed bin.
* kbx/keyboxd.c (create_server_socket): Ditto.
* scd/scdaemon.c (create_server_socket): Ditto.
* tpm2d/tpm2daemon.c (create_server_socket): Ditto.
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/gpg-agent.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 83711b59a..ae1295977 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -2329,18 +2329,12 @@ create_server_socket (char *name, int primary, int cygwin, log_error (_("error getting nonce for the socket\n")); if (rc == -1) { - int w32err = 0; - - if (assuan_sock_get_flag (fd, "w32_error", &w32err)) - w32err = -1; /* Old Libassuan or not Windows. */ - rc = gpg_error_from_syserror (); + log_libassuan_system_error (fd); /* We use gpg_strerror here because it allows us to get strings for some W32 socket error codes. */ log_error (_("error binding socket to '%s': %s\n"), unaddr->sun_path, gpg_strerror (rc)); - if (w32err != -1) - log_info ("system error code: %d (0x%x)\n", w32err, w32err); assuan_sock_close (fd); *name = 0; /* Inhibit removal of the socket by cleanup(). */ @@ -3309,8 +3303,10 @@ handle_connections (gnupg_fd_t listen_fd, (struct sockaddr *)&paddr, &plen); if (fd == GNUPG_INVALID_FD) { + gpg_error_t myerr = gpg_error_from_syserror (); + log_libassuan_system_error (listentbl[idx].l_fd); log_error ("accept failed for %s: %s\n", - listentbl[idx].name, strerror (errno)); + listentbl[idx].name, gpg_strerror (myerr)); } else if ( !(ctrl = xtrycalloc (1, sizeof *ctrl))) { |