1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

agent,dirmngr,kbx,scdaemon: Use assuan_sock_accept.

* agent/gpg-agent.c (handle_connections): Use assuan_sock_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.

--

GnuPG-bug-id: 6599
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2023-07-24 13:52:22 +09:00
parent 0f6e30465f
commit 1eaf915e8e
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
5 changed files with 10 additions and 10 deletions

View File

@ -3222,8 +3222,8 @@ handle_connections (gnupg_fd_t listen_fd,
continue; continue;
plen = sizeof paddr; plen = sizeof paddr;
fd = INT2FD (npth_accept (FD2INT(listentbl[idx].l_fd), fd = assuan_sock_accept (listentbl[idx].l_fd,
(struct sockaddr *)&paddr, &plen)); (struct sockaddr *)&paddr, &plen);
if (fd == GNUPG_INVALID_FD) if (fd == GNUPG_INVALID_FD)
{ {
log_error ("accept failed for %s: %s\n", log_error ("accept failed for %s: %s\n",

View File

@ -2483,8 +2483,8 @@ handle_connections (assuan_fd_t listen_fd)
gnupg_fd_t fd; gnupg_fd_t fd;
plen = sizeof paddr; plen = sizeof paddr;
fd = INT2FD (npth_accept (FD2INT(listen_fd), fd = assuan_sock_accept (listen_fd,
(struct sockaddr *)&paddr, &plen)); (struct sockaddr *)&paddr, &plen);
if (fd == GNUPG_INVALID_FD) if (fd == GNUPG_INVALID_FD)
{ {
log_error ("accept failed: %s\n", strerror (errno)); log_error ("accept failed: %s\n", strerror (errno));

View File

@ -1652,8 +1652,8 @@ handle_connections (gnupg_fd_t listen_fd)
continue; continue;
plen = sizeof paddr; plen = sizeof paddr;
fd = INT2FD (npth_accept (FD2INT(listentbl[idx].l_fd), fd = assuan_sock_accept (listentbl[idx].l_fd,
(struct sockaddr *)&paddr, &plen)); (struct sockaddr *)&paddr, &plen);
if (fd == GNUPG_INVALID_FD) if (fd == GNUPG_INVALID_FD)
{ {
log_error ("accept failed for %s: %s\n", log_error ("accept failed for %s: %s\n",

View File

@ -1399,8 +1399,8 @@ handle_connections (gnupg_fd_t listen_fd)
gnupg_fd_t fd; gnupg_fd_t fd;
plen = sizeof paddr; plen = sizeof paddr;
fd = INT2FD (npth_accept (FD2INT (listen_fd), fd = assuan_sock_accept (listen_fd,
(struct sockaddr *)&paddr, &plen)); (struct sockaddr *)&paddr, &plen);
if (fd == GNUPG_INVALID_FD) if (fd == GNUPG_INVALID_FD)
{ {
log_error ("accept failed: %s\n", strerror (errno)); log_error ("accept failed: %s\n", strerror (errno));

View File

@ -1238,8 +1238,8 @@ handle_connections (gnupg_fd_t listen_fd)
gnupg_fd_t fd; gnupg_fd_t fd;
plen = sizeof paddr; plen = sizeof paddr;
fd = INT2FD (npth_accept (FD2INT (listen_fd), fd = assuan_sock_accept (listen_fd,
(struct sockaddr *)&paddr, &plen)); (struct sockaddr *)&paddr, &plen);
if (fd == GNUPG_INVALID_FD) if (fd == GNUPG_INVALID_FD)
{ {
log_error ("accept failed: %s\n", strerror (errno)); log_error ("accept failed: %s\n", strerror (errno));