Attachment #225165 for bug #301828

Lines 75-81 Link Here

(-)squid-3.0.STABLE25.orig/acinclude.m4 (-1 / +1 lines)
75	AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])	75	AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
76	AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[	76	AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
77	ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc	77	ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
78	${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null	78	${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
79	res=$?	79	res=$?
80	rm -f conftest.*	80	rm -f conftest.*
81	echo yes	81	echo yes




PRESET_LDFLAGS="$LDFLAGS"

dnl Set default LDFLAGS
dnl if test -z "$LDFLAGS"; then
dnl         LDFLAGS="-g"
dnl fi

dnl Check for GNU cc
AC_PROG_CC

dnl TODO: check if the problem will be present in any other newer MinGW release.
    case "$host_os" in
    mingw|mingw32)
        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
	;;
    *)
        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
	;;
    esac
    SQUID_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
else
    SQUID_CFLAGS=
    SQUID_CXXFLAGS=

Lines 27-33 Link Here

(-)squid-3.0.STABLE25.orig/helpers/basic_auth/MSNT/confload.c (-1 / +1 lines)
27		27
28	/* Path to configuration file */	28	/* Path to configuration file */
29	#ifndef SYSCONFDIR	29	#ifndef SYSCONFDIR
30	#define SYSCONFDIR "/usr/local/squid/etc"	30	#define SYSCONFDIR "/etc/squid"
31	#endif	31	#endif
32	#define CONFIGFILE SYSCONFDIR "/msntauth.conf"	32	#define CONFIGFILE SYSCONFDIR "/msntauth.conf"
33		33

Lines 8-13 Link Here

(-)squid-3.0.STABLE25.orig/helpers/basic_auth/MSNT/msntauth.conf.default (-2 / +2 lines)
8	server other_PDC other_BDC otherdomain	8	server other_PDC other_BDC otherdomain
9		9
10	# Denied and allowed users. Comment these if not needed.	10	# Denied and allowed users. Comment these if not needed.
11	#denyusers /usr/local/squid/etc/msntauth.denyusers	11	#denyusers /etc/squid/msntauth.denyusers
12	#allowusers /usr/local/squid/etc/msntauth.allowusers	12	#allowusers /etc/squid/msntauth.allowusers
13		13

Lines 14-20 Link Here

(-)squid-3.0.STABLE25.orig/helpers/basic_auth/SMB/Makefile.am (-1 / +1 lines)
14	## FIXME: autoconf should test for the samba path.	14	## FIXME: autoconf should test for the samba path.
15		15
16	SMB_AUTH_HELPER = smb_auth.sh	16	SMB_AUTH_HELPER = smb_auth.sh
17	SAMBAPREFIX=/usr/local/samba	17	SAMBAPREFIX=/usr
18	SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)	18	SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
19		19
20	libexec_SCRIPTS = $(SMB_AUTH_HELPER)	20	libexec_SCRIPTS = $(SMB_AUTH_HELPER)

Lines 24-30 Link Here

(-)squid-3.0.STABLE25.orig/helpers/basic_auth/SMB/smb_auth.sh (-2 / +2 lines)
24	read AUTHSHARE	24	read AUTHSHARE
25	read AUTHFILE	25	read AUTHFILE
26	read SMBUSER	26	read SMBUSER
27	read SMBPASS	27	read -r SMBPASS
28		28
29	# Find domain controller	29	# Find domain controller
30	echo "Domain name: $DOMAINNAME"	30	echo "Domain name: $DOMAINNAME"
Lines 47-53 Link Here
47	addropt=""	47	addropt=""
48	fi	48	fi
49	echo "Query address options: $addropt"	49	echo "Query address options: $addropt"
50	dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" \| awk '/^[0-9.]+ / { print $1 ; exit }'`	50	dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" \| awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
51	echo "Domain controller IP address: $dcip"	51	echo "Domain controller IP address: $dcip"
52	[ -n "$dcip" ] \|\| exit 1	52	[ -n "$dcip" ] \|\| exit 1
53		53

Lines 35-41 Link Here

(-)squid-3.0.STABLE25.orig/helpers/external_acl/session/squid_session.8 (-1 / +1 lines)
35	.P	35	.P
36	Configuration example using the default automatic mode	36	Configuration example using the default automatic mode
37	.IP	37	.IP
38	external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session	38	external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
39	.IP	39	.IP
40	acl session external session	40	acl session external session
41	.IP	41	.IP

Lines 27-33 Link Here

(-)squid-3.0.STABLE25.orig/helpers/external_acl/unix_group/squid_unix_group.8 (-1 / +1 lines)
27	This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2	27	This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
28	matches users in group2 or group3	28	matches users in group2 or group3
29	.IP	29	.IP
30	external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p	30	external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
31	.IP	31	.IP
32	acl usergroup1 external unix_group group1	32	acl usergroup1 external unix_group group1
33	.IP	33	.IP

Lines 7-13 Link Here

(-)squid-3.0.STABLE25.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh (-1 / +1 lines)
7	#	7	#
8	CC=gcc	8	CC=gcc
9	#CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow -O2"	9	#CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow -O2"
10	CFLAGS="-Wall -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"	10	CFLAGS="-Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
11	if [ "$1" = "HEIMDAL" ]; then	11	if [ "$1" = "HEIMDAL" ]; then
12	DEFINE="-DHEIMDAL -D__LITTLE_ENDIAN__"	12	DEFINE="-DHEIMDAL -D__LITTLE_ENDIAN__"
13	INCLUDE="-I/usr/include/heimdal -Ispnegohelp"	13	INCLUDE="-I/usr/include/heimdal -Ispnegohelp"

Lines 11-17 Link Here

(-)squid-3.0.STABLE25.orig/lib/libTrie/acinclude.m4 (-1 / +1 lines)
11	AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])	11	AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
12	AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[	12	AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
13	ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc	13	ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
14	${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null	14	${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
15	res=$?	15	res=$?
16	rm -f conftest.*	16	rm -f conftest.*
17	echo yes	17	echo yes

Lines 58-65 Link Here

(-)squid-3.0.STABLE25.orig/lib/libTrie/configure.in (-2 / +2 lines)
58		58
59	dnl set useful flags	59	dnl set useful flags
60	if test "$GCC" = "yes"; then	60	if test "$GCC" = "yes"; then
61	TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"	61	TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
62	TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"	62	TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
63	else	63	else
64	TRIE_CFLAGS=	64	TRIE_CFLAGS=
65	TRIE_CXXFLAGS=	65	TRIE_CXXFLAGS=

Lines 652-657 Link Here

(-)squid-3.0.STABLE25.orig/src/cf.data.pre (-2 / +13 lines)
652	acl Safe_ports port 488 # gss-http	652	acl Safe_ports port 488 # gss-http
653	acl Safe_ports port 591 # filemaker	653	acl Safe_ports port 591 # filemaker
654	acl Safe_ports port 777 # multiling http	654	acl Safe_ports port 777 # multiling http
		655	acl Safe_ports port 901 # SWAT
		656	acl purge method PURGE
655	acl CONNECT method CONNECT	657	acl CONNECT method CONNECT
656	NOCOMMENT_END	658	NOCOMMENT_END
657	DOC_END	659	DOC_END
Lines 685-690 Link Here
685	# Only allow cachemgr access from localhost	687	# Only allow cachemgr access from localhost
686	http_access allow manager localhost	688	http_access allow manager localhost
687	http_access deny manager	689	http_access deny manager
		690	# Only allow purge requests from localhost
		691	http_access allow purge localhost
		692	http_access deny purge
688	# Deny requests to unknown ports	693	# Deny requests to unknown ports
689	http_access deny !Safe_ports	694	http_access deny !Safe_ports
690	# Deny CONNECT to other than SSL ports	695	# Deny CONNECT to other than SSL ports
Lines 702-707 Link Here
702	# from where browsing should be allowed	707	# from where browsing should be allowed
703	http_access allow localnet	708	http_access allow localnet
704		709
		710	# Allow the localhost to have access by default
		711	http_access allow localhost
		712
705	# And finally deny all other access to this proxy	713	# And finally deny all other access to this proxy
706	http_access deny all	714	http_access deny all
707	NOCOMMENT_END	715	NOCOMMENT_END
Lines 3296-3306 Link Here
3296		3304
3297	NAME: cache_mgr	3305	NAME: cache_mgr
3298	TYPE: string	3306	TYPE: string
3299	DEFAULT: webmaster	3307	DEFAULT: root
3300	LOC: Config.adminEmail	3308	LOC: Config.adminEmail
3301	DOC_START	3309	DOC_START
3302	Email-address of local cache manager who will receive	3310	Email-address of local cache manager who will receive
3303	mail if the cache dies. The default is "webmaster."	3311	mail if the cache dies. The default is "root".
3304	DOC_END	3312	DOC_END
3305		3313
3306	NAME: mail_from	3314	NAME: mail_from
Lines 5268-5273 Link Here
5268	If you disable this, it will appear as	5276	If you disable this, it will appear as
5269		5277
5270	X-Forwarded-For: unknown	5278	X-Forwarded-For: unknown
		5279	NOCOMMENT_START
		5280	forwarded_for off
		5281	NOCOMMENT_END
5271	DOC_END	5282	DOC_END
5272		5283
5273	NAME: cachemgr_passwd	5284	NAME: cachemgr_passwd

Lines 465-471 Link Here

(-)squid-3.0.STABLE25.orig/src/debug.cc (-1 / +1 lines)
465	#if HAVE_SYSLOG && defined(LOG_LOCAL4)	465	#if HAVE_SYSLOG && defined(LOG_LOCAL4)
466		466
467	if (opt_syslog_enable)	467	if (opt_syslog_enable)
468	openlog(appname, LOG_PID \| LOG_NDELAY \| LOG_CONS, syslog_facility);	468	openlog(appname, LOG_PID \| LOG_NDELAY, syslog_facility);
469		469
470	#endif /* HAVE_SYSLOG */	470	#endif /* HAVE_SYSLOG */
471		471

Lines 218-224 Link Here

(-)squid-3.0.STABLE25.orig/src/defines.h (-1 / +1 lines)
218		218
219	/* were to look for errors if config path fails */	219	/* were to look for errors if config path fails */
220	#ifndef DEFAULT_SQUID_ERROR_DIR	220	#ifndef DEFAULT_SQUID_ERROR_DIR
221	#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors"	221	#define DEFAULT_SQUID_ERROR_DIR "/usr/share/squid/errors/English"
222	#endif	222	#endif
223		223
224	/* handy to determine the #elements in a static array */	224	/* handy to determine the #elements in a static array */




    if (*(argv[0]) == '(')
        return;

    openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);

    if ((pid = fork()) < 0)
        syslog(LOG_ALERT, "fork failed: %s", xstrerror());


        if ((pid = fork()) == 0) {
            /* child */
            openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
            prog = xstrdup(argv[0]);
            argv[0] = xstrdup("(squid)");
            execvp(prog, argv);

        }

        /* parent */
        openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);

        syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);





DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_LOG_PREFIX	= $(localstatedir)/log/squid
DEFAULT_CACHE_LOG       = $(DEFAULT_LOG_PREFIX)/cache.log
DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
DEFAULT_PID_FILE        = $(localstatedir)/run/squid.pid
DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
DEFAULT_PINGER		= $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_UNLINKD		= $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_DISKD		= $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`

Return to bug 301828

Lines 1512-1518 Link Here

(-)squid-3.0.STABLE25.orig/src/main.cc (-3 / +3 lines)
1512	if (*(argv[0]) == '(')	1512	if (*(argv[0]) == '(')
1513	return;	1513	return;
1514		1514
1515	openlog(appname, LOG_PID \| LOG_NDELAY \| LOG_CONS, LOG_LOCAL4);	1515	openlog(appname, LOG_PID \| LOG_NDELAY, LOG_DAEMON);
1516		1516
1517	if ((pid = fork()) < 0)	1517	if ((pid = fork()) < 0)
1518	syslog(LOG_ALERT, "fork failed: %s", xstrerror());	1518	syslog(LOG_ALERT, "fork failed: %s", xstrerror());
Lines 1556-1562 Link Here
1556		1556
1557	if ((pid = fork()) == 0) {	1557	if ((pid = fork()) == 0) {
1558	/* child */	1558	/* child */
1559	openlog(appname, LOG_PID \| LOG_NDELAY \| LOG_CONS, LOG_LOCAL4);	1559	openlog(appname, LOG_PID \| LOG_NDELAY, LOG_DAEMON);
1560	prog = xstrdup(argv[0]);	1560	prog = xstrdup(argv[0]);
1561	argv[0] = xstrdup("(squid)");	1561	argv[0] = xstrdup("(squid)");
1562	execvp(prog, argv);	1562	execvp(prog, argv);
Lines 1564-1570 Link Here
1564	}	1564	}
1565		1565
1566	/* parent */	1566	/* parent */
1567	openlog(appname, LOG_PID \| LOG_NDELAY \| LOG_CONS, LOG_LOCAL4);	1567	openlog(appname, LOG_PID \| LOG_NDELAY, LOG_DAEMON);
1568		1568
1569	syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);	1569	syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
1570		1570

Lines 995-1006 Link Here

(-)squid-3.0.STABLE25.orig/src/Makefile.am (-3 / +3 lines)
995	DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf	995	DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
996	DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf	996	DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
997	DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver \| sed '$(transform);s/$$/$(EXEEXT)/'`	997	DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver \| sed '$(transform);s/$$/$(EXEEXT)/'`
998	DEFAULT_LOG_PREFIX = $(localstatedir)/logs	998	DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
999	DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log	999	DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
1000	DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log	1000	DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
1001	DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log	1001	DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
1002	DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid	1002	DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
1003	DEFAULT_SWAP_DIR = $(localstatedir)/cache	1003	DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
1004	DEFAULT_PINGER = $(libexecdir)/`echo pinger \| sed '$(transform);s/$$/$(EXEEXT)/'`	1004	DEFAULT_PINGER = $(libexecdir)/`echo pinger \| sed '$(transform);s/$$/$(EXEEXT)/'`
1005	DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd \| sed '$(transform);s/$$/$(EXEEXT)/'`	1005	DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd \| sed '$(transform);s/$$/$(EXEEXT)/'`
1006	DEFAULT_DISKD = $(libexecdir)/`echo diskd \| sed '$(transform);s/$$/$(EXEEXT)/'`	1006	DEFAULT_DISKD = $(libexecdir)/`echo diskd \| sed '$(transform);s/$$/$(EXEEXT)/'`

Lines 15-23 Link Here

(-)squid-3.0.STABLE25.orig/configure.in (-6 / +6 lines)
15	PRESET_LDFLAGS="$LDFLAGS"	15	PRESET_LDFLAGS="$LDFLAGS"
16		16
17	dnl Set default LDFLAGS	17	dnl Set default LDFLAGS
18	if test -z "$LDFLAGS"; then	18	dnl if test -z "$LDFLAGS"; then
19	LDFLAGS="-g"	19	dnl LDFLAGS="-g"
20	fi	20	dnl fi
21		21
22	dnl Check for GNU cc	22	dnl Check for GNU cc
23	AC_PROG_CC	23	AC_PROG_CC
Lines 177-189 Link Here
177	dnl TODO: check if the problem will be present in any other newer MinGW release.	177	dnl TODO: check if the problem will be present in any other newer MinGW release.
178	case "$host_os" in	178	case "$host_os" in
179	mingw\|mingw32)	179	mingw\|mingw32)
180	SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"	180	SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
181	;;	181	;;
182	*)	182	*)
183	SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"	183	SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
184	;;	184	;;
185	esac	185	esac
186	SQUID_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"	186	SQUID_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
187	else	187	else
188	SQUID_CFLAGS=	188	SQUID_CFLAGS=
189	SQUID_CXXFLAGS=	189	SQUID_CXXFLAGS=