[asterisk-commits] tilghman: branch 1.8 r287935 - in /branches/1.8: ./ main/asterisk.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Sep 21 14:08:36 2010
New Revision: 287935

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287935
Log:
Merged revisions 287934 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r287934 | tilghman | 2010-09-21 14:07:53 -0500 (Tue, 21 Sep 2010) | 9 lines
  
  Merged revisions 287933 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r287933 | tilghman | 2010-09-21 14:07:07 -0500 (Tue, 21 Sep 2010) | 2 lines
    
    Less than zero is an error, not any non-zero value.
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/main/asterisk.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/asterisk.c?view=diff&rev=287935&r1=287934&r2=287935
==============================================================================
--- branches/1.8/main/asterisk.c (original)
+++ branches/1.8/main/asterisk.c Tue Sep 21 14:08:36 2010
@@ -3386,7 +3386,7 @@
 		}
 
 		fd2 = (l.rlim_cur > sizeof(readers) * 8 ? sizeof(readers) * 8 : l.rlim_cur) - 1;
-		if (dup2(fd, fd2)) {
+		if (dup2(fd, fd2) < 0) {
 			ast_log(LOG_WARNING, "Cannot open maximum file descriptor %d at boot? %s\n", fd2, strerror(errno));
 			break;
 		}