aboutsummaryrefslogtreecommitdiffstats
path: root/src/assuan-socket-server.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2023-05-17 01:55:17 +0000
committerNIIBE Yutaka <[email protected]>2023-05-17 01:55:17 +0000
commit6350f796fdd1c7519c35a9cd71b33b6dafc5ed3a (patch)
treeb95049d835579972a6f0236b018d68a2f5082aac /src/assuan-socket-server.c
parentFix comments. (diff)
downloadlibassuan-6350f796fdd1c7519c35a9cd71b33b6dafc5ed3a.tar.gz
libassuan-6350f796fdd1c7519c35a9cd71b33b6dafc5ed3a.zip
w32: Cleaner semantics for PID and Process handle.
* src/assuan-defs.h (struct assuan_context_s): Introduce SERVER_PROC member. Clarify the use of PROCESS_ID and PID. Introduce assuan_pid_t for internal use of process id or handle. * src/assuan.h.in: Follow the change. * src/assuan.c (assuan_new_ext): Likewise. * src/client.c (_assuan_client_finish): Likewise. * src/assuan-pipe-connect.c (pipe_connect): Likewise. * src/server.c (_assuan_server_finish): Likewise. * src/system-posix.c: Likewise. * src/system-w32.c: Likewise. * src/system.c: Likewise. * src/assuan-pipe-server.c (assuan_init_pipe_server) [HAVE_W32_SYSTEM]: Exclude the use of _assuan_pipe_connect_pid. * src/assuan-socket-server.c (accept_connection_bottom) [HAVE_W32_SYSTEM]: Exclude the use of the member peercred.pid. * src/assuan-socket.c (_assuan_sock_check_nonce): Support Cygwin Unix domain emulation for having valid client process ID. * src/context.c (assuan_get_pid): Clarify the use cases. * src/posix-types.inc.h, src/w32-types.inc.h: Introduce assuan_pid_t. -- GnuPG-bug-id: 6487 Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'src/assuan-socket-server.c')
-rw-r--r--src/assuan-socket-server.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/assuan-socket-server.c b/src/assuan-socket-server.c
index f5fe038..a260221 100644
--- a/src/assuan-socket-server.c
+++ b/src/assuan-socket-server.c
@@ -139,10 +139,12 @@ accept_connection_bottom (assuan_context_t ctx)
}
#endif
+#if !defined(HAVE_W32_SYSTEM)
/* This overrides any already set PID if the function returns
a valid one. */
if (ctx->peercred_valid && ctx->peercred.pid != ASSUAN_INVALID_PID)
ctx->pid = ctx->peercred.pid;
+#endif
ctx->inbound.fd = fd;
ctx->inbound.eof = 0;