- (djm) [configure.ac] Add a timeout to the select/rlimit test to give it a
chance to complete on broken systems; ok dtucker@
This commit is contained in:
parent
2b6ea47106
commit
e4f4347822
|
@ -5,6 +5,8 @@
|
|||
was removed in configure.ac rev 1.481 as it was redundant.
|
||||
- (tim) [Makefile.in] Add another missing $(EXEEXT) I should have seen 3 days
|
||||
ago.
|
||||
- (djm) [configure.ac] Add a timeout to the select/rlimit test to give it a
|
||||
chance to complete on broken systems; ok dtucker@
|
||||
|
||||
20130306
|
||||
- (dtucker) [regress/forward-control.sh] Wait longer for the forwarding
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: configure.ac,v 1.512 2013/03/06 06:48:48 dtucker Exp $
|
||||
# $Id: configure.ac,v 1.513 2013/03/08 01:14:23 djm Exp $
|
||||
#
|
||||
# Copyright (c) 1999-2004 Damien Miller
|
||||
#
|
||||
|
@ -15,7 +15,7 @@
|
|||
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
|
||||
AC_REVISION($Revision: 1.512 $)
|
||||
AC_REVISION($Revision: 1.513 $)
|
||||
AC_CONFIG_SRCDIR([ssh.c])
|
||||
AC_LANG([C])
|
||||
|
||||
|
@ -2673,6 +2673,7 @@ AC_RUN_IFELSE(
|
|||
struct rlimit rl_zero;
|
||||
int fd, r;
|
||||
fd_set fds;
|
||||
struct timeval tv;
|
||||
|
||||
fd = open("/dev/null", O_RDONLY);
|
||||
FD_ZERO(&fds);
|
||||
|
@ -2680,7 +2681,9 @@ AC_RUN_IFELSE(
|
|||
rl_zero.rlim_cur = rl_zero.rlim_max = 0;
|
||||
setrlimit(RLIMIT_FSIZE, &rl_zero);
|
||||
setrlimit(RLIMIT_NOFILE, &rl_zero);
|
||||
r = select(fd+1, &fds, NULL, NULL, NULL);
|
||||
tv.tv_sec = 1;
|
||||
tv.tv_usec = 0;
|
||||
r = select(fd+1, &fds, NULL, NULL, &tv);
|
||||
exit (r == -1 ? 1 : 0);
|
||||
]])],
|
||||
[AC_MSG_RESULT([yes])
|
||||
|
|
Loading…
Reference in New Issue