From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 26 May 2020 22:32:55 +0000 (-0700)
Subject: Common source file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.2.0~216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e256c4eb87e602c981cd9b92ec4c52df861094f4;p=thirdparty%2Fopen-vm-tools.git

Common source file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/poll/poll.c b/open-vm-tools/lib/poll/poll.c
index da2db361d..6c762a101 100644
--- a/open-vm-tools/lib/poll/poll.c
+++ b/open-vm-tools/lib/poll/poll.c
@@ -42,7 +42,6 @@
    #include <winsock2.h>
    #include <ws2tcpip.h>
    #include "err.h"
-   #include "preference.h"
 #endif
 
 /*
@@ -502,9 +501,7 @@ PollSocketPairConnect(Bool blocking,           // IN: blocking socket?
 
       if (connect(*s, addr, addrlen) == SOCKET_ERROR) {
          WSAPOLLFD pollFds[1];
-         /* wait timeout seconds */
-         unsigned int timeout = Preference_GetLong(3,
-            "pref.wsa.socket.pair.connect.timeout.seconds") * 1000;
+         unsigned int timeout = 3 * 1000; /* wait 3 seconds */
          int ret = WSAGetLastError();
          if (ret != WSAEWOULDBLOCK) {
             /* connection failed */