From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Thu, 15 May 2008 14:05:25 +0000 (-0600)
Subject: Bootstrapped and build tested
X-Git-Tag: SQUID_3_0_STABLE6~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b64b69f16b2da7c7d96cde7a6bb52877f835cec;p=thirdparty%2Fsquid.git

Bootstrapped and build tested
---

diff --git a/configure b/configure
index a34c525151..d09bc2c5f1 100755
--- a/configure
+++ b/configure
@@ -44458,7 +44458,12 @@ main() {
     if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
         perror("getrlimit: RLIMIT_NOFILE");
     } else {
+#if defined(__APPLE__)
+        /* asking for more than OPEN_MAX fails on Leopard */
+        rl.rlim_cur = (OPEN_MAX < rl.rlim_max ? OPEN_MAX : rl.rlim_max);
+#else
         rl.rlim_cur = rl.rlim_max;      /* set it to the max */
+#endif
         if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
             perror("setrlimit: RLIMIT_NOFILE");
         }
diff --git a/helpers/basic_auth/squid_radius_auth/Makefile.in b/helpers/basic_auth/squid_radius_auth/Makefile.in
index 2bb09425d5..ab9a26a6c2 100644
--- a/helpers/basic_auth/squid_radius_auth/Makefile.in
+++ b/helpers/basic_auth/squid_radius_auth/Makefile.in
@@ -58,7 +58,8 @@ CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man8dir)"
 libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
-am_squid_radius_auth_OBJECTS = squid_rad_auth.$(OBJEXT) util.$(OBJEXT)
+am_squid_radius_auth_OBJECTS = squid_rad_auth.$(OBJEXT) \
+	radius-util.$(OBJEXT)
 squid_radius_auth_OBJECTS = $(am_squid_radius_auth_OBJECTS)
 squid_radius_auth_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
@@ -305,7 +306,8 @@ EXTRA_DIST = squid_radius_auth.8
 squid_radius_auth_SOURCES = \
 			squid_rad_auth.c \
 			radius.h \
-			util.c util.h
+			radius-util.c \
+			radius-util.h
 
 LDADD = -L$(top_builddir)/lib -lmiscutil $(SSLLIB) $(XTRA_LIBS)
 INCLUDES = -I$(top_srcdir)/include
@@ -380,8 +382,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radius-util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/squid_rad_auth.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \