diff options
| author | NIIBE Yutaka <[email protected]> | 2023-01-04 02:35:56 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2023-01-04 02:35:56 +0000 |
| commit | e4e54fb4ba1b82f1cd08ea44ad4c48db4c236311 (patch) | |
| tree | 36454ed5b2e77ccf6356abbd61afcfd1e37af67c /src | |
| parent | Fix make dist target (diff) | |
| download | libassuan-e4e54fb4ba1b82f1cd08ea44ad4c48db4c236311.tar.gz libassuan-e4e54fb4ba1b82f1cd08ea44ad4c48db4c236311.zip | |
w32: Fix assuan_socket_connect.
* src/assuan-socket-connect.c (_assuan_connect_finalize): Don't set
flags.is_socket here, since it's too late.
(assuan_socket_connect_fd): Set flags.is_socket.
(assuan_socket_connect): Set flags.is_socket, before _assuan_sock_new.
--
GnuPG-bug-id: 6324
Fixes-commit: c93eb901e58d5b31294c2d452659b5150d95ec59
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/assuan-socket-connect.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c index 2d3405f..d08a33e 100644 --- a/src/assuan-socket-connect.c +++ b/src/assuan-socket-connect.c @@ -113,7 +113,6 @@ _assuan_connect_finalize (assuan_context_t ctx, assuan_fd_t fd, ctx->inbound.fd = fd; ctx->outbound.fd = fd; ctx->max_accepts = -1; - ctx->flags.is_socket = 1; #ifdef HAVE_W32_SYSTEM ctx->engine.sendfd = w32_fdpass_send; @@ -186,6 +185,7 @@ assuan_socket_connect_fd (assuan_context_t ctx, assuan_fd_t fd, if (fd == ASSUAN_INVALID_FD) return GPG_ERR_INV_ARG; + ctx->flags.is_socket = 1; err = _assuan_connect_finalize (ctx, fd, flags); if (err) @@ -351,6 +351,7 @@ assuan_socket_connect (assuan_context_t ctx, const char *name, return err; } + ctx->flags.is_socket = 1; fd = _assuan_sock_new (ctx, pf, SOCK_STREAM, 0); if (fd == ASSUAN_INVALID_FD) { |