From: VMware, Inc <>
Date: Sat, 28 May 2011 19:50:42 +0000 (-0700)
Subject: lib/file: bad merge
X-Git-Tag: 2011.05.27-420096~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4256ff2db2efc687d9d0990f61936ae506d3e42a;p=thirdparty%2Fopen-vm-tools.git

lib/file: bad merge

I merge a change and dropped some code that needed to be there.

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

diff --git a/open-vm-tools/lib/file/fileIOPosix.c b/open-vm-tools/lib/file/fileIOPosix.c
index 0e51dce57..e73a5f477 100644
--- a/open-vm-tools/lib/file/fileIOPosix.c
+++ b/open-vm-tools/lib/file/fileIOPosix.c
@@ -882,9 +882,11 @@ FileIOCreateRetry(FileIODescriptor *file,   // OUT:
    }
 #endif
 
+#if defined(O_NOFOLLOW)
    if (access & FILEIO_OPEN_ACCESS_NOFOLLOW) {
       flags |= O_NOFOLLOW;
    }
+#endif
 
    flags |= FileIO_OpenActions[action];