[asterisk-commits] tilghman: branch 1.6.0 r211276 - in /branches/1.6.0: ./ main/astfd.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sun Aug  9 10:43:17 2009
New Revision: 211276

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=211276
Log:
Merged revisions 211275 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r211275 | tilghman | 2009-08-09 10:42:02 -0500 (Sun, 09 Aug 2009) | 9 lines
  
  Merged revisions 211274 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r211274 | tilghman | 2009-08-09 10:41:01 -0500 (Sun, 09 Aug 2009) | 2 lines
    
    Small oops.  Clear the flags which have been checked.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/astfd.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/astfd.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/main/astfd.c?view=diff&rev=211276&r1=211275&r2=211276
==============================================================================
--- branches/1.6.0/main/astfd.c (original)
+++ branches/1.6.0/main/astfd.c Sun Aug  9 10:43:17 2009
@@ -98,7 +98,7 @@
 				flags & O_RDONLY ? "|O_RDONLY" : "",
 				flags & O_WRONLY ? "|O_WRONLY" : "",
 				"");
-			flags |= ~(O_CREAT | O_APPEND | O_EXCL | O_NONBLOCK | O_TRUNC | O_RDWR | O_RDONLY | O_WRONLY);
+			flags &= ~(O_CREAT | O_APPEND | O_EXCL | O_NONBLOCK | O_TRUNC | O_RDWR | O_RDONLY | O_WRONLY);
 			if (flags) {
 				STORE_COMMON(res, "open", "\"%s\",%s|%d,%04o", path, sflags, flags, mode);
 			} else {