From: VMware, Inc <>
Date: Mon, 15 Oct 2012 04:46:00 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2012.10.14-874563~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=100b9bed8ad79b3f4683c410731cab862ebff2ef;p=thirdparty%2Fopen-vm-tools.git

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

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

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index c202ae101..18102fcab 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -91,25 +91,25 @@ typedef enum GuestOSFamilyType {
 #define ALLWINEIGHTSERVER64 BS(WINEIGHTSERVER_64)
 #define ALLWINEIGHTSERVER   ALLWINEIGHTSERVER64
 
-#define ALLWINEIGHT32   BS(WINEIGHT)
-#define ALLWINEIGHT64   BS(WINEIGHT_64)
-#define ALLWINEIGHT     (ALLWINEIGHT32 | ALLWINEIGHT64)
+#define ALLWINEIGHTCLIENT32   BS(WINEIGHT)
+#define ALLWINEIGHTCLIENT64   BS(WINEIGHT_64)
+#define ALLWINEIGHTCLIENT    (ALLWINEIGHTCLIENT32 | ALLWINEIGHTCLIENT64)
 
 #define ALLHYPER_V      BS(HYPER_V)
 
 #define ALLWINVISTA_OR_HIGHER (ALLWINVISTA | ALLWINLONGHORN | ALLWIN2008R2 | \
                                ALLWINSEVEN | ALLWINEIGHTSERVER | \
-                               ALLWINEIGHT | ALLHYPER_V)
+                               ALLHYPER_V  | ALLWINEIGHTCLIENT)
 
 #define ALLWINNT32	(BS(WINNT) | ALLWIN2000 | ALLWINXP32 | ALLWINNET32 | \
                          ALLWINVISTA32 | ALLWINLONGHORN32 | \
                          ALLWINSEVEN32 | ALLWIN2008R2_32 | \
-                         ALLWINEIGHT32)
+                         ALLWINEIGHTCLIENT32)
 
-#define ALLWINNT64	(ALLWINXP64    | ALLWINNET64 | \
-                         ALLWINVISTA64 | ALLWINLONGHORN64 | \
-                         ALLWINSEVEN64 | ALLWIN2008R2_64 | \
-                         ALLWINEIGHT64 | ALLWINEIGHTSERVER | \
+#define ALLWINNT64	(ALLWINXP64          | ALLWINNET64 | \
+                         ALLWINVISTA64       | ALLWINLONGHORN64 | \
+                         ALLWINSEVEN64       | ALLWIN2008R2_64 | \
+                         ALLWINEIGHTCLIENT64 | ALLWINEIGHTSERVER | \
                          ALLHYPER_V)
 
 #define ALLWINNT	(ALLWINNT32 | ALLWINNT64)
diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h
index c1f990f81..84f442fdb 100644
--- a/open-vm-tools/lib/include/vm_version.h
+++ b/open-vm-tools/lib/include/vm_version.h
@@ -247,7 +247,7 @@
 #define VDDK_VERSION          "6.0.0"
 #define VDDK_FILE_VERSION      6,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
 #define OVFTOOL_VERSION "e.x.p"
-#define OVFTOOL_FILE_VERSION 3,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
+#define OVFTOOL_FILE_VERSION 3,0,1,PRODUCT_BUILD_NUMBER_NUMERIC
 #define VDM_CLIENT_VERSION "e.x.p"
 #define VGAUTH_VERSION "e.x.p"
 #define VIEWY_VERSION "e.x.p"
diff --git a/open-vm-tools/lib/stubs/stub-config.c b/open-vm-tools/lib/stubs/stub-config.c
index 5e83eb0c5..9f6909d80 100644
--- a/open-vm-tools/lib/stubs/stub-config.c
+++ b/open-vm-tools/lib/stubs/stub-config.c
@@ -55,6 +55,11 @@ Config_GetString(const char *defaultValue,
    return (defaultValue == NULL) ? NULL : strdup(defaultValue);
 }
 
+Bool
+Preference_Init(void)
+{
+   return TRUE;
+}
 
 Bool
 Preference_GetBool(Bool defaultValue,