From: VMware, Inc <>
Date: Tue, 17 Nov 2009 22:11:19 +0000 (-0800)
Subject: GuestInfo: Fix a botched merge.
X-Git-Tag: 2009.11.16-210370~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac5f950a920cbfc1648678623c46acd7bb4f91c5;p=thirdparty%2Fopen-vm-tools.git

GuestInfo: Fix a botched merge.

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

diff --git a/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c b/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
index 753b8006f..028f4c1df 100644
--- a/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
+++ b/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
@@ -409,13 +409,16 @@ GuestInfoGather(gpointer data)
    } else if (GuestInfo_IsEqual_NicInfoV3(nicInfo, gInfoCache.nicInfo)) {
       g_debug("Nic info not changed.\n");
       GuestInfo_FreeNicInfo(nicInfo);
-   } else {
+   } else if (GuestInfoUpdateVmdb(ctx, INFO_IPADDRESS, nicInfo)) {
       /*
        * Since the update succeeded, free the old cached object, and assign
        * ours to the cache.
        */
       GuestInfo_FreeNicInfo(gInfoCache.nicInfo);
       gInfoCache.nicInfo = nicInfo;
+   } else {
+      g_warning("Failed to update VMDB.\n");
+      GuestInfo_FreeNicInfo(nicInfo);
    }
 
    /* Send the uptime to VMX so that it can detect soft resets. */