From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 31 Jul 2020 20:36:34 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.2.0~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=534f6bcbdda25bc9999c306cdd0d8e3e89f8f95c;p=thirdparty%2Fopen-vm-tools.git

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

diff --git a/open-vm-tools/lib/asyncsocket/asyncSocketBase.c b/open-vm-tools/lib/asyncsocket/asyncSocketBase.c
index 731918890..ea761e624 100644
--- a/open-vm-tools/lib/asyncsocket/asyncSocketBase.c
+++ b/open-vm-tools/lib/asyncsocket/asyncSocketBase.c
@@ -787,6 +787,10 @@ AsyncSocket_MsgError(int asyncSockError)   // IN
       result = MSGID(asyncsocket.proxyconnectfailed)
                      "Connection failed through proxy";
       break;
+   case ASOCKERR_PROXY_INVALID_OR_NOT_SUPPORTED:
+      result = MSGID(asyncsocket.proxyinvalidornotsupported)
+                     "Invalid or not supported type proxy";
+      break;
    case ASOCKERR_WEBSOCK_UPGRADE_NOT_FOUND:
       result = MSGID(asyncsocket.websocketupgradefailed)
                      "Upgrade to websocket error: NOT FOUND, status code 404";
diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h
index 37081c0e4..746dd78b7 100644
--- a/open-vm-tools/lib/include/asyncsocket.h
+++ b/open-vm-tools/lib/include/asyncsocket.h
@@ -85,6 +85,7 @@ extern "C" {
 #define ASOCKERR_PROXY_CONNECT_FAILED        18
 #define ASOCKERR_WEBSOCK_UPGRADE_NOT_FOUND   19
 #define ASOCKERR_WEBSOCK_TOO_MANY_CONNECTION 20
+#define ASOCKERR_PROXY_INVALID_OR_NOT_SUPPORTED 21
 
 /*
  * Cross-platform codes for AsyncSocket_GetGenericError():