From 645cf7d8fc25615fd6d2cb027fad8f3dadffb09d Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 14 May 2025 10:34:46 +0200 Subject: Revert "w32: On socket nonce mismatch close the socket." -- The commit was entirely bogus because the check_nonce function closes the socket itself if it returns with true. Thus closing the socket by the caller in the true case was bogus. The more likely cause for the hangs on Windows are in scdaemon: * scd: Fix posssible lockup on Windows due to a lost select result. [rGa7ec3792c5] GnuPG-bug-id: 7434 Fixes-commit: 73f6c2dd4d3e5b58faf69821726988ae984fad89. --- dirmngr/dirmngr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dirmngr') diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 492171aac..08f313879 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -2272,8 +2272,7 @@ start_connection_thread (void *arg) if (check_nonce (fd, &socket_nonce)) { - log_error ("handler for fd %d FAILED nonce check\n", FD_DBG (fd)); - assuan_sock_close (fd); + log_error ("handler nonce check FAILED\n"); return NULL; } -- cgit v1.2.3