Changeset 454 for trunk/server/source3/locking/posix.c

Timestamp:

Jun 4, 2010, 3:11:43 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

File:

• trunk/server/source3/locking/posix.c (modified) (2 diffs)

trunk/server/source3/locking/posix.c

@@ -252 +252 @@
         ret = SMB_VFS_GETLOCK(fsp, poffset, pcount, ptype, &pid);
 
+#ifndef __OS2__ /* file locks currently fail with OS/2's libc */
         if (!ret && ((errno == EFBIG) || (errno == ENOLCK) || (errno ==  EINVAL))) {
 
@@ -277 +278 @@
                 }
         }
+#endif
 
         DEBUG(8,("posix_fcntl_getlock: Lock query call %s\n", ret ? "successful" : "failed"));