From: Oliver Kurth <okurth@vmware.com>
Date: Wed, 21 Mar 2018 19:55:37 +0000 (-0700)
Subject: Disable CAF for 10.2.5 release; added logic on Windows to close the socket
X-Git-Tag: 10.2.5~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98f04ea660b66e2775b0d4d700346033fc74dc1a;p=thirdparty%2Fopen-vm-tools.git

Disable CAF for 10.2.5 release; added logic on Windows to close the socket
opened when checking if the tunnel has been enabled.
---

diff --git a/open-vm-tools/common-agent/Cpp/ManagementAgent/Subsystems/MaIntegration/src/CConfigEnvMerge.cpp b/open-vm-tools/common-agent/Cpp/ManagementAgent/Subsystems/MaIntegration/src/CConfigEnvMerge.cpp
index 5d6483f27..ff6ba4938 100644
--- a/open-vm-tools/common-agent/Cpp/ManagementAgent/Subsystems/MaIntegration/src/CConfigEnvMerge.cpp
+++ b/open-vm-tools/common-agent/Cpp/ManagementAgent/Subsystems/MaIntegration/src/CConfigEnvMerge.cpp
@@ -2,7 +2,7 @@
  *	 Author: bwilliams
  *  Created: Oct 22, 2010
  *
- *	Copyright (C) 2010-2016 VMware, Inc.  All rights reserved. -- VMware Confidential
+ *	Copyright (C) 2010-2018 VMware, Inc.  All rights reserved. -- VMware Confidential
  */
 
 #include "stdafx.h"
@@ -242,6 +242,10 @@ bool CConfigEnvMerge::isTunnelEnabledFunc() {
 		}
 
 		rc = (0 == ::connect(socketFd, (SOCKADDR*) &socketClient, sizeof(socketClient)));
+
+		if (socketFd != INVALID_SOCKET) {
+			::closesocket(socketFd);
+		}
 	}
 	CAF_CM_CATCH_CAF
 	CAF_CM_CATCH_DEFAULT