From: VMware, Inc <>
Date: Tue, 19 Oct 2010 19:02:33 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2010.10.18-313025~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44d7752de5091b2d74e217d43a246563f67fceaa;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/services/plugins/vmbackup/stateMachine.c b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
index b704603dc..a60ef1180 100644
--- a/open-vm-tools/services/plugins/vmbackup/stateMachine.c
+++ b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
@@ -984,9 +984,12 @@ ToolsOnLoad(ToolsAppCtx *ctx)
 #if defined(G_PLATFORM_WIN32)
    /*
     * If initializing COM fails (unlikely), we'll fallback to the sync driver
-    * or the null provider, depending on the configuration.
+    * or the null provider, depending on the configuration. On success, send
+    * a request to unregister the VMware snapshot provider.
     */
-   if (!ToolsCore_InitializeCOM(ctx)) {
+   if (ToolsCore_InitializeCOM(ctx)) {
+      VmBackup_UnregisterSnapshotProvider();
+   } else {
       g_warning("Failed to initialize COM, VSS support will be unavailable.");
    }
 #endif
diff --git a/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h b/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h
index 6c0e79cf2..dabd547bf 100644
--- a/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h
+++ b/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h
@@ -214,6 +214,9 @@ VmBackup_NewSyncDriverProvider(void);
 #if defined(G_PLATFORM_WIN32)
 VmBackupSyncProvider *
 VmBackup_NewVssProvider(void);
+
+void
+VmBackup_UnregisterSnapshotProvider(void);
 #endif
 
 VmBackupOp *