--------------------- PatchSet 7435 Date: 2008/03/02 22:23:25 Author: amosjeffries Branch: cleanup Tag: (none) Log: .h alteration compile errors. Members: helpers/ntlm_auth/fakeauth/fakeauth_auth.c:1.9.10.1->1.9.10.2 tools/Makefile.am:1.1.48.2->1.1.48.3 tools/cachemgr.cc:1.6->1.6.4.1 Index: squid3/helpers/ntlm_auth/fakeauth/fakeauth_auth.c =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/ntlm_auth/fakeauth/fakeauth_auth.c,v retrieving revision 1.9.10.1 retrieving revision 1.9.10.2 diff -u -r1.9.10.1 -r1.9.10.2 --- squid3/helpers/ntlm_auth/fakeauth/fakeauth_auth.c 16 Feb 2008 12:02:08 -0000 1.9.10.1 +++ squid3/helpers/ntlm_auth/fakeauth/fakeauth_auth.c 2 Mar 2008 22:23:25 -0000 1.9.10.2 @@ -392,7 +392,7 @@ if ((p = strchr(buf, '\n')) != NULL) *p = '\0'; /* strip \n */ buflen = strlen(buf); /* keep this so we only scan the buffer for \0 once per loop */ - if (slen > 3) + if (buflen > 3) decoded = base64_decode(buf + 3); if (buflen > 3 && NTLM_packet_debug_enabled) { strncpy(helper_command, buf, 2); Index: squid3/tools/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/tools/Makefile.am,v retrieving revision 1.1.48.2 retrieving revision 1.1.48.3 diff -u -r1.1.48.2 -r1.1.48.3 --- squid3/tools/Makefile.am 20 Feb 2008 11:38:45 -0000 1.1.48.2 +++ squid3/tools/Makefile.am 2 Mar 2008 22:23:25 -0000 1.1.48.3 @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.1.48.2 2008/02/20 11:38:45 amosjeffries Exp $ +# $Id: Makefile.am,v 1.1.48.3 2008/03/02 22:23:25 amosjeffries Exp $ # # Uncomment and customize the following to suit your needs: # @@ -13,11 +13,11 @@ INCLUDES += @SQUID_CPPUNIT_INC@ TESTS=$(check_PROGRAMS) -check_PROGRAMS= testHeaders +#check_PROGRAMS= testHeaders -## Special Universal .h dependency test script -testHeaders: *.h - ../test-suite/testheaders.sh "$(CXXCOMPILE)" "." +### Special Universal .h dependency test script +#testHeaders: *.h +# ./ has no .h files SUBDIRS = Index: squid3/tools/cachemgr.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/tools/cachemgr.cc,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -u -r1.6 -r1.6.4.1 --- squid3/tools/cachemgr.cc 14 Dec 2007 23:51:09 -0000 1.6 +++ squid3/tools/cachemgr.cc 2 Mar 2008 22:23:25 -0000 1.6.4.1 @@ -1,6 +1,5 @@ - /* - * $Id: cachemgr.cc,v 1.6 2007/12/14 23:51:09 squidadm Exp $ + * $Id: cachemgr.cc,v 1.6.4.1 2008/03/02 22:23:25 amosjeffries Exp $ * * DEBUG: section 0 CGI Cache Manager * AUTHOR: Duane Wessels @@ -135,6 +134,7 @@ #include "assert.h" #include "util.h" #include "IPAddress.h" +#include "getfullhostname.h" #ifndef DEFAULT_CACHEMGR_CONFIG #define DEFAULT_CACHEMGR_CONFIG "/etc/squid/cachemgr.conf"