[tor-commits] [tor/master] Merge branch 'bug21074_029'
nickm at torproject.org
nickm at torproject.org
Tue Jan 16 19:31:48 UTC 2018
commit 454d85436385a7ee0b60f18834d707d72b08b915
Merge: f470756cf 68ca6d2e1
Author: Nick Mathewson <nickm at torproject.org>
Date: Tue Jan 16 14:13:39 2018 -0500
Merge branch 'bug21074_029'
changes/bug21074_downgrade | 4 ++++
src/common/compat.c | 14 +++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --cc src/common/compat.c
index b4bd6eba0,a88e9b514..7c9b2f808
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@@ -1761,14 -1738,13 +1762,13 @@@ set_max_file_descriptors(rlim_t limit,
(unsigned long)try_limit, (unsigned long)OPEN_MAX,
(unsigned long)rlim.rlim_max);
}
- bad = 0;
+ couldnt_set = 0;
}
}
-#endif /* OPEN_MAX */
+#endif /* defined(OPEN_MAX) */
- if (bad) {
+ if (couldnt_set) {
log_warn(LD_CONFIG,"Couldn't set maximum number of file descriptors: %s",
- strerror(errno));
- return -1;
+ strerror(setrlimit_errno));
}
}
/* leave some overhead for logs, etc, */
More information about the tor-commits
mailing list