Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2007-05-20 13:25:57 UTC
Modified files:
Tag: u2_10_12_branch
configure.in ChangeLog
Log message:
Fix SF#1696425 by failing configure if MAXCONNECTIONS is too small.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.182 ircu2.10/ChangeLog:1.710.2.183
--- ircu2.10/ChangeLog:1.710.2.182 Sun May 20 06:02:51 2007
+++ ircu2.10/ChangeLog Sun May 20 06:25:47 2007
@@ -1,5 +1,10 @@
2007-05-20 Michael Poole <mdpoole@xxxxxxxxxxx>
+ * configure.in (maxcon): Check that maximum connections is
+ sufficiently large to avoid underflow in MAXCLIENTS.
+
+2007-05-20 Michael Poole <mdpoole@xxxxxxxxxxx>
+
* include/supported.h (FEATURES2): Remove extra space.
* ircd/m_admin.c (m_admin): Only check server mask against our
Index: ircu2.10/configure.in
diff -u ircu2.10/configure.in:1.34.2.1 ircu2.10/configure.in:1.34.2.2
--- ircu2.10/configure.in:1.34.2.1 Tue Dec 13 19:01:38 2005
+++ ircu2.10/configure.in Sun May 20 06:25:47 2007
@@ -19,7 +19,7 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
dnl
-dnl $Id: configure.in,v 1.34.2.1 2005/12/14 03:01:38 entrope Exp $
+dnl $Id: configure.in,v 1.34.2.2 2007/05/20 13:25:47 entrope Exp $
dnl Make sure we are in the correct directory (someone could have run
dnl 'configure' with a wrong '--srcdir').
@@ -710,7 +710,12 @@
[unet_cv_with_maxcon=$unet_maxcon])])
if test x"$unet_cv_with_maxcon" = xyes -o x"$unet_cv_with_maxcon" = xno; then
+ if test "$unet_maxcon" -lt 32; then
+ AC_MSG_ERROR([Maximum connections (number of open files minus 4) must be
at least 32.])
+ fi
unet_cv_with_maxcon=$unet_maxcon
+elif test "$unet_cv_with_maxcon" -lt 32; then
+ AC_MSG_ERROR([Maximum connections (--with-maxcon) must be at least 32.])
fi
AC_MSG_RESULT([$unet_cv_with_maxcon])
----------------------- End of diff -----------------------
|
