1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00

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.
This commit is contained in:
Werner Koch 2025-03-05 10:24:14 +01:00
parent c68eca6363
commit 41cf76b8c1
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
7 changed files with 43 additions and 17 deletions

View file

@ -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)))
{