From: Oliver Kurth <okurth@vmware.com>
Date: Mon, 15 Apr 2019 18:32:59 +0000 (-0700)
Subject: Changes to common source files not directly applicable to open-vm-tools.
X-Git-Tag: stable-11.0.0~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da8c476be54bcd94c6b4f15a013dd02419b4ec29;p=thirdparty%2Fopen-vm-tools.git

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

Add an error code to a debug message.
---

diff --git a/open-vm-tools/lib/include/conf.h b/open-vm-tools/lib/include/conf.h
index 594285322..fd5b18fb8 100644
--- a/open-vm-tools/lib/include/conf.h
+++ b/open-vm-tools/lib/include/conf.h
@@ -284,4 +284,21 @@
  ******************************************************************************
  */
 
+/*
+ ******************************************************************************
+ * BEGIN logging goodies.
+ */
+
+/**
+ * Defines the string used for the logging config file group.
+ */
+#define CONFGROUPNAME_LOGGING "logging"
+
+#define CONFNAME_LOGGING_INSTALL_VMXGUESTLOGDISABLED "install-vmxGuestLogDisabled"
+
+/*
+ * END logging goodies.
+ ******************************************************************************
+ */
+
 #endif /* __CONF_H__ */
diff --git a/open-vm-tools/libvmtools/vmtoolsConfig.c b/open-vm-tools/libvmtools/vmtoolsConfig.c
index a11e51871..c38fd312d 100644
--- a/open-vm-tools/libvmtools/vmtoolsConfig.c
+++ b/open-vm-tools/libvmtools/vmtoolsConfig.c
@@ -283,8 +283,10 @@ VMTools_ConfigGetBoolean(GKeyFile *config,
          g_warning("%s: Failed to get value for '[%s] %s': %s (err=%d).\n",
                    __FUNCTION__, section, key, err->message, err->code);
       }
-      g_debug("%s: Returning default value for '[%s] %s'=%s.\n",
-              __FUNCTION__, section, key, defValue ? "TRUE" : "FALSE");
+      g_debug("%s: Returning default value for '[%s] %s'=%s "
+              "(Not found err=%d).\n",
+              __FUNCTION__, section, key, defValue ? "TRUE" : "FALSE",
+              err->code);
       value = defValue;
       g_clear_error(&err);
    }