From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 21 Sep 2010 19:08:36 +0000 (+0000)
Subject: Merged revisions 287934 via svnmerge from
X-Git-Tag: 1.8.0-rc1~3^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74e9d2b2394ff44f01c15e95eb792a71ad67b691;p=thirdparty%2Fasterisk.git

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.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@287935 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/asterisk.c b/main/asterisk.c
index f8d619a798..c484f3be7f 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3386,7 +3386,7 @@ int main(int argc, char *argv[])
 		}
 
 		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;
 		}