From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 21 Jul 2020 18:53:00 +0000 (-0700)
Subject: Common source file changes not directly applicable to open-vm-tools at this time.
X-Git-Tag: stable-11.2.0~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b9521c96f0ec985d4965c73e9fd70e9718b3d53;p=thirdparty%2Fopen-vm-tools.git

Common source file changes not directly applicable to open-vm-tools at this time.
---

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