From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 21 Sep 2010 19:07:53 +0000 (+0000)
Subject: Merged revisions 287933 via svnmerge from
X-Git-Tag: 1.6.2.15-rc1~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc97038290c675601870eb7c71c0808b38c9743a;p=thirdparty%2Fasterisk.git

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.6.2@287934 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/asterisk.c b/main/asterisk.c
index 2706685467..d23cc49be6 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3354,7 +3354,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;
 		}