---------------------
PatchSet 1202 
Date: 2001/01/08 14:03:21
Author: rbcollins
Branch: auth_digest
Tag: (none) 
Log:
digest catchup with mergess from head and auth_rewrite

Members: 
	configure.in:1.1.1.3.10.17.2.5.2.6->1.1.1.3.10.17.2.5.2.7 
	src/auth/digest/Makefile.in:1.1.2.1->1.1.2.2 
	src/auth/digest/auth_digest.c:1.1.2.11->1.1.2.12 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.1.1.3.10.17.2.5.2.6
retrieving revision 1.1.1.3.10.17.2.5.2.7
diff -u -r1.1.1.3.10.17.2.5.2.6 -r1.1.1.3.10.17.2.5.2.7
--- squid/configure.in	8 Jan 2001 01:33:14 -0000	1.1.1.3.10.17.2.5.2.6
+++ squid/configure.in	8 Jan 2001 14:03:21 -0000	1.1.1.3.10.17.2.5.2.7
@@ -3,13 +3,13 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.1.1.3.10.17.2.5.2.6 2001/01/08 01:33:14 rbcollins Exp $
+dnl  $Id: configure.in,v 1.1.1.3.10.17.2.5.2.7 2001/01/08 14:03:21 rbcollins Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.1.1.3.10.17.2.5.2.6 $)dnl
+AC_REVISION($Revision: 1.1.1.3.10.17.2.5.2.7 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(cfgaux)
 
@@ -761,7 +761,7 @@
 AC_SUBST(AUTH_BASIC_HELPERS)
 
 dnl Select ntlm auth helpers to build
-NTLM_AUTH_HELPERS=
+NTLM_AUTH_HELPERS=""
 AC_ARG_ENABLE(ntlm-auth-helpers,
 [  --enable-ntlm-auth-helpers=\"list of helpers\"
                           This option selects which proxy_auth ntlm helpers
@@ -795,7 +795,7 @@
                           helpers to build and install as part of the normal build
                           process. For a list of available modules see the
                           src/auth/digest/helpers directory.],
-case "$enableval" in
+[ case "$enableval" in
   yes)
     for helper in $srcdir/src/auth/digest/helpers/*; do
         if test -f $helper/Makefile.in; then
Index: squid/src/auth/digest/Makefile.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/auth/digest/Attic/Makefile.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid/src/auth/digest/Makefile.in	14 Dec 2000 23:10:14 -0000	1.1.2.1
+++ squid/src/auth/digest/Makefile.in	8 Jan 2001 14:03:22 -0000	1.1.2.2
@@ -6,6 +6,8 @@
 
 AUTH		= digest
 
+SUBDIRS		= helpers
+
 top_srcdir	= @top_srcdir@
 VPATH		= @srcdir@
 
@@ -25,7 +27,12 @@
 		auth_digest.o
 
 
-all: $(OUT)
+all install: $(OUT)
+	@for dir in $(SUBDIRS); do \
+	if [ -f $$dir/Makefile ]; then \
+	       sh -c "cd $$dir && $(MAKE) $@" || exit 1; \
+	fi; \
+	done;
 
 $(OUT): $(OBJS)
 	@rm -f ../stamp
@@ -40,13 +47,21 @@
 
 clean: 
 	-rm -rf *.o *pure_* core ../$(AUTH).a
+	-for dir in *; do \
+	    if [ -f $$dir/Makefile ]; then \
+	        sh -c "cd $$dir && $(MAKE) clean"; \
+	    fi; \
+	done
 
 distclean:	clean
 	-rm -f Makefile
 	-rm -f Makefile.bak
 	-rm -f tags
-
-install:
+	-for dir in *; do \
+	    if [ -f $$dir/Makefile ]; then \
+	        sh -c "cd $$dir && $(MAKE) distclean"; \
+	    fi; \
+	done
 
 tags:
 	ctags *.[ch] $(top_srcdir)/src/*.[ch] $(top_srcdir)/include/*.h $(top_srcdir)/lib/*.[ch]
Index: squid/src/auth/digest/auth_digest.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/auth/digest/auth_digest.c,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- squid/src/auth/digest/auth_digest.c	5 Jan 2001 06:31:44 -0000	1.1.2.11
+++ squid/src/auth/digest/auth_digest.c	8 Jan 2001 14:03:22 -0000	1.1.2.12
@@ -79,6 +79,8 @@
 MemPool *digest_request_pool = NULL;
 MemPool *digest_nonce_pool = NULL;
 
+CBDATA_TYPE(authenticateStateData);
+
 /* strings */
 #define QOP_AUTH "auth"
 
@@ -730,6 +732,7 @@
                 authenticateDigestStats, 0, 1);
             init++;
         }
+    CBDATA_INIT_TYPE(authenticateStateData);
     }
 }
 
@@ -1172,8 +1175,7 @@
         handler(data, NULL);
         return;
     }
-    r = xcalloc(1, sizeof(authenticateStateData));
-    cbdataAdd(r, cbdataXfree, 0);
+    r = CBDATA_ALLOC(authenticateStateData, NULL);
     r->handler = handler;
     cbdataLock(data);
     r->data = data;