r1897 - in branches/1.1: . lib/libvarnish

[des at projects.linpro.no]

Author: des
Date: 2007-08-20 17:22:52 +0200 (Mon, 20 Aug 2007)
New Revision: 1897

Modified:
   branches/1.1/
   branches/1.1/lib/libvarnish/flopen.c
Log:
Merged revisions 1896 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r1896 | des | 2007-08-20 17:18:49 +0200 (Mon, 20 Aug 2007) | 2 lines
  
  Correct the lock.l_type logic for platforms where O_RDONLY is 0.
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838,1846,1853-1855,1857-1859,1862,1865,1867-1868,1871,1873-1880
   + /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838,1846,1853-1855,1857-1859,1862,1865,1867-1868,1871,1873-1880,1896

Modified: branches/1.1/lib/libvarnish/flopen.c
===================================================================
--- branches/1.1/lib/libvarnish/flopen.c	2007-08-20 15:18:49 UTC (rev 1896)
+++ branches/1.1/lib/libvarnish/flopen.c	2007-08-20 15:22:52 UTC (rev 1897)
@@ -60,7 +60,7 @@
 		va_end(ap);
 	}
 
-	lock.l_type = (flags & O_RDONLY) ? F_RDLCK : F_WRLCK;
+	lock.l_type = ((flags & O_ACCMODE) == O_RDONLY) ? F_RDLCK : F_WRLCK;
 	lock.l_start = 0;
 	lock.l_whence = SEEK_SET;
 	lock.l_len = 0;