From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 21 Jul 2020 18:52:59 +0000 (-0700)
Subject: Backout the immediately previous changes to common files.
X-Git-Tag: stable-11.2.0~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5a24c41aa23c155a24ed65174cd986452fddd0d;p=thirdparty%2Fopen-vm-tools.git

Backout the immediately previous changes to common files.
---

diff --git a/open-vm-tools/lib/include/conf.h b/open-vm-tools/lib/include/conf.h
index 76c100919..3f82e19dc 100644
--- a/open-vm-tools/lib/include/conf.h
+++ b/open-vm-tools/lib/include/conf.h
@@ -495,24 +495,4 @@
  ******************************************************************************
  */
 
-/*
- ******************************************************************************
- * BEGIN CarbonBlack goodies.
- */
-
-/**
- * Define the string used for carbonblack config file group
- */
-#define CONFGROUPNAME_CARBONBLACK "carbonblack"
-
-/**
- * Defines user-defined polling interval in seconds.
- */
-#define CONFNAME_CARBONBLACK_POLLINTERVAL "poll-interval"
-
-/*
- ******************************************************************************
- * END CarbonBlack goodies.
- */
-
 #endif /* __CONF_H__ */
diff --git a/open-vm-tools/tools.conf b/open-vm-tools/tools.conf
index ea1fe047b..a697e1184 100644
--- a/open-vm-tools/tools.conf
+++ b/open-vm-tools/tools.conf
@@ -315,10 +315,3 @@
 
 # to disable guest customization
 #enable-customization=false
-
-[carbonblack]
-
-# The carbonblack plugin is only available for Windows.
-
-# User-defined poll interval in seconds. Set to 0 to disable polling.
-#poll-interval=60