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 5942853221180242a92dd69048e9693c8719348c..fd5b18fb8276e688f88fea79de146e98f8855393 100644 (file)
--- 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 a11e5187173d07ee1428c09ec74c0686a9bfe907..c38fd312d5205c2dd1f6beb1dc248569d9aee91c 100644 (file)
--- 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);
    }