aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-21 19:09:15 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-21 19:09:15 +0000
commit38227225d4451e92fc7f0155b00ab908c7e19db1 (patch)
treee2ad43af65ddbfb837a4667551ae75128938332e
parentfbcd20fb3ff39fb3e37f311c063137d44ef0241e (diff)
Merged revisions 287935 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r287935 | tilghman | 2010-09-21 14:08:36 -0500 (Tue, 21 Sep 2010) | 16 lines 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: http://svn.digium.com/svn/asterisk/trunk@287936 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/asterisk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index f8d619a79..c484f3be7 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;
}