From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 18 Aug 2020 14:14:11 +0000 (-0700)
Subject: Changes to common source files not directly applicable to open-vm-tools.
X-Git-Tag: stable-11.2.0~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46808762d89d92cdb2d2d382ff01227bdaf99f49;p=thirdparty%2Fopen-vm-tools.git

Changes to common source files not directly applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/conf.h b/open-vm-tools/lib/include/conf.h
index 187d2a126..202c4bbdb 100644
--- a/open-vm-tools/lib/include/conf.h
+++ b/open-vm-tools/lib/include/conf.h
@@ -510,11 +510,6 @@
  */
 #define CONFNAME_CBHELPER_POLLINTERVAL "poll-interval"
 
-/**
- * Defines user-defined retry counter to execute cblauncher.exe on failure.
- */
-#define CONFNAME_CBHELPER_CBLAUNCHER_RETRY_COUNT "cblauncher-retry-count"
-
 /*
  ******************************************************************************
  * END CarbonBlack helper plugin goodies.
diff --git a/open-vm-tools/tools.conf b/open-vm-tools/tools.conf
index 22b8fdf5f..8fea80a69 100644
--- a/open-vm-tools/tools.conf
+++ b/open-vm-tools/tools.conf
@@ -322,7 +322,3 @@
 
 # User-defined poll interval in seconds. Set to 0 to disable polling.
 #poll-interval=60
-
-# User-defined retry count to execute cblauncher.exe
-# Default to 3 and should be greater than 3.
-#cblauncher-retry-count=3