From: VMware, Inc <>
Date: Mon, 15 Oct 2012 04:56:04 +0000 (-0700)
Subject: Deal with conflict with Dell's Open Manage Software
X-Git-Tag: 2012.10.14-874563~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3ddadf25fbb1af2b4d9536abd158963b9ed7fe6;p=thirdparty%2Fopen-vm-tools.git

Deal with conflict with Dell's Open Manage Software

When dell open manage software and vmware tools uses the same libraries.
There is a conflict as the versions of libraries are not the same.

This does not really affect open-vm-tools as they use system libraries
and do not ship their own.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---

diff --git a/open-vm-tools/services/vmtoolsd/pluginMgr.c b/open-vm-tools/services/vmtoolsd/pluginMgr.c
index 119a520b7..38095981f 100644
--- a/open-vm-tools/services/vmtoolsd/pluginMgr.c
+++ b/open-vm-tools/services/vmtoolsd/pluginMgr.c
@@ -547,6 +547,7 @@ ToolsCoreLoadDirectory(ToolsAppCtx *ctx,
       }
 
 #ifdef USE_APPLOADER
+      /* Trying loading the plugins with system libraries */
       if (!LoadDependencies(path, FALSE)) {
          g_warning("Loading of library dependencies for %s failed.\n", entry);
          goto next;
@@ -554,6 +555,17 @@ ToolsCoreLoadDirectory(ToolsAppCtx *ctx,
 #endif
 
       module = g_module_open(path, G_MODULE_BIND_LOCAL);
+#ifdef USE_APPLOADER
+      if (module == NULL) {
+         /* Falling back to the shipped libraries */
+         if (!LoadDependencies(path, TRUE)) {
+            g_warning("Loading of shipped library dependencies for %s failed.\n",
+                     entry);
+            goto next;
+         }
+         module = g_module_open(path, G_MODULE_BIND_LOCAL);
+      }
+#endif
       if (module == NULL) {
          g_warning("Opening plugin '%s' failed: %s.\n", entry, g_module_error());
          goto next;