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 5d6483f275a6d4473aef92550b4780c352082679..ff6ba49385c4d3c04cd216768fe7b59abc1fff70 100644 (file)
--- 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