SQUASH or remove both? Build breakage.

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

diff --git a/open-vm-tools/lib/file/fileTempPosix.c b/open-vm-tools/lib/file/fileTempPosix.c
index 306dee86eced801222d66bf58bb6f588dbc59a25..c5bf90fe23ea31adb2d5948a758afa512bab424c 100644 (file)
--- a/open-vm-tools/lib/file/fileTempPosix.c
+++ b/open-vm-tools/lib/file/fileTempPosix.c
@@ -456,12 +456,9 @@ FileCreateSafeTmpDir(uid_t userId,            // IN:
  *
  *      Return a safe temporary directory (i.e. a temporary directory which
  *      is not prone to symlink attacks, because it is only writable by the
- *      current effective user).
- *
- *      Guaranteed to return the same directory every time it is
- *      called during the lifetime of the current process, for the
- *      current effective user ID. (Barring the user manually deleting
- *      or renaming the directory.)
+ *      current effective user). Guaranteed to return the same directory
+ *      every time it is called during the lifetime of the current process
+ *      (unless that directory is deleted while the process is running).
  *
  * Results:
  *      The allocated directory path on success.

diff --git a/open-vm-tools/lib/include/file.h b/open-vm-tools/lib/include/file.h
index 2a60aa3742ad376f944cddfa4aa47b998141073e..afd17898f9901016a58828dfbdceecc177649c42 100644 (file)
--- a/open-vm-tools/lib/include/file.h
+++ b/open-vm-tools/lib/include/file.h
@@ -108,10 +108,7 @@ char *FileMacos_DiskDevToVolumeName(char const *bsdDiskDev);
 
 char *FileMacos_DiskDeviceToUniqueID(char const *bsdPath);
 char *FileMacos_UniqueIDToDiskDevice(char const *identifier);
-Bool FileMacOS_MakeSecureLibraryCopies(const char   *inDir,
-                                       const char  **dylibName,
-                                       unsigned      numDylibs,
-                                       char        **outDir);
+
 #elif defined VMX86_SERVER
 struct FS_PartitionListResult;
 

diff --git a/open-vm-tools/lib/include/mutexRankLib.h b/open-vm-tools/lib/include/mutexRankLib.h
index 9bc7edc73c6fe6f5bc149a08728c6ba8609ab691..04b455f1d2be8df6dd0a74c8239b844c2b07cd39 100644 (file)
--- a/open-vm-tools/lib/include/mutexRankLib.h
+++ b/open-vm-tools/lib/include/mutexRankLib.h
@@ -137,15 +137,15 @@
  * At least:
  *    impersonate < pollDefault
  *    keyLocator < preference (for checking AESNI)
- *    keyLocator < sslState (bug 743010)
+ *    keyLocator < ssl (bug 743010)
  *    configDb < keyLocator (for unlocking dictionaries)
  *    battery/button < preference
  *    workerLib < something for sure under VThread_Create
  *    licenseCheck < preference
- *    sslState < getSafeTmpDir
  */
 
 #define RANK_vigorTransportListLock  (RANK_libLockBase + 0x7010)
+#define RANK_getSafeTmpDirLock       (RANK_libLockBase + 0x7020)
 #define RANK_batteryLock             (RANK_libLockBase + 0x7030)
 #define RANK_buttonLock              (RANK_libLockBase + 0x7040)
 #define RANK_impersonateLock         (RANK_libLockBase + 0x7045)
@@ -154,7 +154,6 @@
 #define RANK_configDbLock            (RANK_libLockBase + 0x7070)
 #define RANK_keyLocatorLock          (RANK_libLockBase + 0x7080)
 #define RANK_sslStateLock            (RANK_libLockBase + 0x7085)
-#define RANK_getSafeTmpDirLock       (RANK_libLockBase + 0x7086)
 #define RANK_licenseCheckLock        (RANK_libLockBase + 0x7090)
 #define RANK_preferenceLock          (RANK_libLockBase + 0x7100)