]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
GuestInfo: Fix a botched merge.
authorVMware, Inc <>
Tue, 17 Nov 2009 22:11:19 +0000 (14:11 -0800)
committerMarcelo Vanzin <mvanzin@vmware.com>
Tue, 17 Nov 2009 22:11:19 +0000 (14:11 -0800)
Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
open-vm-tools/services/plugins/guestInfo/guestInfoServer.c

index 753b8006ff839c308e442b8ba2313a716b7e7615..028f4c1dfaad99f8adb85cfc82692d2e5d0c9ec9 100644 (file)
@@ -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. */