shadow password patch from John Saunders <johns@rd.scitec.com.au>

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 8c34a4d6453de985bbc2d4f7e8f1aa728ea569be..bc95c0ea806e475e91483996c31cfb3abd5443b3 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -30,6 +30,7 @@ Special thanks go to people who have volunteered their time, effort, and ideas t
        Cord Beermann <cord@cc.fh-lippe.de>
        Stephen R. van den Berg <srb@cuci.nl>
        Jon Thackray <jrmt@uk.gdscorp.com>
+       John Saunders <johns@rd.scitec.com.au>
 
 
 Development of this caching software is funded by the National Science

diff --git a/ChangeLog b/ChangeLog
index c490318995d57f83c38ff2c0d97930b107fba3da..acbbcdcb406d4e227c37cf3dc2e2e5c6c42f6c2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+       - Fixed 'quick_abort' parsing bug
+       - NULL terminate too-long URL strings in urlParse().
+       - Added shadow password patch from John Saunders <johns@rd.scitec.com.au>
+
 Changes to squid-1.1.alpha12:
 
        - Rewrote storeGetMemSpace().

diff --git a/configure b/configure
index 3309da5d3b9ac03c74313a2f68ba618780bce82f..fb2d5f00b121d2e8fe007a1e23921c0376bbc061 100755 (executable)
--- a/configure
+++ b/configure
@@ -517,7 +517,7 @@ fi
 
 
 
-# From configure.in Revision: 1.26 
+# From configure.in Revision: 1.27 
 ac_aux_dir=
 for ac_dir in aux $srcdir/aux; do
   if test -f $ac_dir/install-sh; then
@@ -1295,6 +1295,7 @@ for ac_hdr in \
        pwd.h \
        regex.h \
        resolv.h \
+       shadow.h \
        signal.h \
        stdarg.h \
        stddef.h \
@@ -1325,7 +1326,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1329 "configure"
+#line 1330 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -1356,7 +1357,7 @@ done
 
 echo $ac_n "checking for tm->tm_gmtoff""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 1360 "configure"
+#line 1361 "configure"
 #include "confdefs.h"
 #include <time.h>
 #include <sys/time.h>
@@ -1382,7 +1383,7 @@ rm -f conftest*
 
 echo $ac_n "checking for extended mallinfo""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 1386 "configure"
+#line 1387 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <malloc.h>
@@ -1414,7 +1415,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
 cat > conftest.$ac_ext <<EOF
-#line 1418 "configure"
+#line 1419 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1448,7 +1449,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
 cat > conftest.$ac_ext <<EOF
-#line 1452 "configure"
+#line 1453 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1482,7 +1483,7 @@ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1486 "configure"
+#line 1487 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() { return 0; }
@@ -1514,7 +1515,7 @@ if eval "test \"`echo '$''{'ac_cv_func_alloca'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1518 "configure"
+#line 1519 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1573,7 +1574,7 @@ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1577 "configure"
+#line 1578 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1602,7 +1603,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1606 "configure"
+#line 1607 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1656,7 +1657,7 @@ else
   ac_cv_c_stack_direction=0
 else
 cat > conftest.$ac_ext <<EOF
-#line 1660 "configure"
+#line 1661 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -1701,7 +1702,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1705 "configure"
+#line 1706 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1741,7 +1742,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1745 "configure"
+#line 1746 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1781,7 +1782,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmalloc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1785 "configure"
+#line 1786 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1815,7 +1816,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1819 "configure"
+#line 1820 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1855,7 +1856,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1859 "configure"
+#line 1860 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1896,7 +1897,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l44bsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1900 "configure"
+#line 1901 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1930,7 +1931,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1934 "configure"
+#line 1935 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1965,7 +1966,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1969 "configure"
+#line 1970 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1993,6 +1994,47 @@ fi
 
 
 
+echo $ac_n "checking for -lshadow""... $ac_c" 1>&6
+ac_lib_var=`echo shadow | tr '.-/+' '___p'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lshadow  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2006 "configure"
+#include "confdefs.h"
+
+int main() { return 0; }
+int t() {
+main()
+; return 0; }
+EOF
+if eval $ac_link; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo shadow | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lshadow $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
 AIO_LIBS=""
 echo $ac_n "checking for -labi""... $ac_c" 1>&6
 ac_lib_var=`echo abi | tr '.-/+' '___p'`
@@ -2002,7 +2044,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-labi  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2006 "configure"
+#line 2048 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2036,7 +2078,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2040 "configure"
+#line 2082 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2143,7 +2185,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2147 "configure"
+#line 2189 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2193,7 +2235,7 @@ if test "$cross_compiling" = yes; then
   SQUID_FD_SETSIZE=256
 else
 cat > conftest.$ac_ext <<EOF
-#line 2197 "configure"
+#line 2239 "configure"
 #include "confdefs.h"
 
 #include <unistd.h>
@@ -2263,7 +2305,7 @@ if test "$cross_compiling" = yes; then
   SQUID_UDP_SO_SNDBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2267 "configure"
+#line 2309 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2299,7 +2341,7 @@ if test "$cross_compiling" = yes; then
   SQUID_UDP_SO_RCVBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2303 "configure"
+#line 2345 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2335,7 +2377,7 @@ if test "$cross_compiling" = yes; then
   SQUID_TCP_SO_SNDBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2339 "configure"
+#line 2381 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2371,7 +2413,7 @@ if test "$cross_compiling" = yes; then
   SQUID_TCP_SO_RCVBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2375 "configure"
+#line 2417 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2404,7 +2446,7 @@ EOF
 
 echo $ac_n "checking if sys_errlist is already defined""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 2408 "configure"
+#line 2450 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() { return 0; }

diff --git a/configure.in b/configure.in
index 1c7ffbc2388e22e9820980320989d4eb84822026..cf2dd64cae1b9c046dc24b2c0ac0ff0380bef9dc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,13 +3,13 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.27 1996/08/19 23:09:43 wessels Exp $
+dnl  $Id: configure.in,v 1.28 1996/08/27 18:01:34 wessels Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.27 $)dnl
+AC_REVISION($Revision: 1.28 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(aux)
 
@@ -140,6 +140,7 @@ AC_CHECK_HEADERS( \
        pwd.h \
        regex.h \
        resolv.h \
+       shadow.h \
        signal.h \
        stdarg.h \
        stddef.h \
@@ -207,6 +208,9 @@ dnl We use crypt(3) which may be in libc, or in libcrypt (eg FreeBSD)
 AC_CHECK_LIB(crypt, crypt, [CRYPT_LIB="-lcrypt"])
 AC_SUBST(CRYPT_LIB)
 
+dnl Check for libshadow which is needed by the shadow password suite
+AC_CHECK_LIB(shadow, main)
+
 dnl Check for libs needed for aio_read()/aio_write()
 AIO_LIBS=""
 AC_CHECK_LIB(abi, main, [HAVE_LIBABI="yes"])

diff --git a/include/autoconf.h.in b/include/autoconf.h.in
index be80730523d16a2a3f64a7d12fe8dfc8f5a6b9c8..d29838a581b85a6b411ae3b20a9105281ba5ae41 100644 (file)
--- a/include/autoconf.h.in
+++ b/include/autoconf.h.in
@@ -205,6 +205,9 @@
 /* Define if you have the <resolv.h> header file.  */
 #undef HAVE_RESOLV_H
 
+/* Define if you have the <shadow.h> header file.  */
+#undef HAVE_SHADOW_H
+
 /* Define if you have the <signal.h> header file.  */
 #undef HAVE_SIGNAL_H
 
@@ -286,5 +289,8 @@
 /* Define if you have the resolv library (-lresolv).  */
 #undef HAVE_LIBRESOLV
 
+/* Define if you have the shadow library (-lshadow).  */
+#undef HAVE_LIBSHADOW
+
 /* Define if you have the socket library (-lsocket).  */
 #undef HAVE_LIBSOCKET

diff --git a/src/squid.h b/src/squid.h
index af6c0ada975830ca0c8e896ba8c376072ea272a0..8ca2ddb68e4da964be6c83b59a6d39a5dc6321b4 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.41 1996/08/26 22:47:56 wessels Exp $
+ * $Id: squid.h,v 1.42 1996/08/27 18:01:37 wessels Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -140,6 +140,11 @@
 #include <syslog.h>
 #endif
 
+/* Only enable shadow password suite if both header and library exist */
+#if HAVE_SHADOW_H && HAVE_LIBSHADOW
+#include <shadow.h>
+#endif
+
 #if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 128)
 #define SQUIDHOSTNAMELEN 128
 #else