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 3f82e19dc4074a491961664761ee212b10386245..202c4bbdb4693ceb33ba1706d9ad38d5c7beb4a9 100644 (file)
--- 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 a697e1184feab252d6573a8e2b2230362572431d..a63e842ada6c93f063307064d3b114933ecbb3b9 100644 (file)
--- 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