Attachment #461140 for bug #606994

Lines 26-34 PRESET_CFLAGS="$CFLAGS" Link Here

(-)a/configure.ac (-3 / +3 lines)
26	PRESET_LDFLAGS="$LDFLAGS"	26	PRESET_LDFLAGS="$LDFLAGS"
27		27
28	dnl Set default LDFLAGS	28	dnl Set default LDFLAGS
29	if test "x$LDFLAGS" = "x" ; then	29	dnl if test "x$LDFLAGS" = "x" ; then
30	LDFLAGS="-g"	30	dnl LDFLAGS="-g"
31	fi	31	dnl fi
32		32
33	# Check for GNU cc	33	# Check for GNU cc
34	AC_PROG_CC	34	AC_PROG_CC

Lines 450-456 _db_init(const char logfile, const char options) Link Here

(-)a/src/debug.cc (-1 / +1 lines)
450	#if HAVE_SYSLOG && defined(LOG_LOCAL4)	450	#if HAVE_SYSLOG && defined(LOG_LOCAL4)
451		451
452	if (Debug::log_syslog)	452	if (Debug::log_syslog)
453	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY \| LOG_CONS, syslog_facility);	453	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY, syslog_facility);
454		454
455	#endif /* HAVE_SYSLOG */	455	#endif /* HAVE_SYSLOG */
456		456




    if (!IamMasterProcess())
        return;

    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);

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


            if ((pid = fork()) == 0) {
                /* child */
                openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
                prog = argv[0];
                argv[0] = const_cast<char*>(kid.name().termedBuf());
                execvp(prog, argv);

        }

        /* parent */
        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);

        squid_signal(SIGINT, SIG_IGN, SA_RESTART);





acl Safe_ports port 488		# gss-http
acl Safe_ports port 591		# filemaker
acl Safe_ports port 777		# multiling http
acl Safe_ports port 901		# SWAT
acl CONNECT method CONNECT
NOCOMMENT_END
DOC_END


NAME: cache_mgr
TYPE: string
DEFAULT: root
LOC: Config.adminEmail
DOC_START
	Email-address of local cache manager who will receive
	mail if the cache dies.  The default is "root".
DOC_END

NAME: mail_from

Return to bug 606994

Lines 1657-1663 watch_child(char *argv[]) Link Here

(-)a/src/main.cc (-3 / +3 lines)
1657	if (!IamMasterProcess())	1657	if (!IamMasterProcess())
1658	return;	1658	return;
1659		1659
1660	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY \| LOG_CONS, LOG_LOCAL4);	1660	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY, LOG_LOCAL4);
1661		1661
1662	if ((pid = fork()) < 0)	1662	if ((pid = fork()) < 0)
1663	syslog(LOG_ALERT, "fork failed: %s", xstrerror());	1663	syslog(LOG_ALERT, "fork failed: %s", xstrerror());
Lines 1720-1726 watch_child(char *argv[]) Link Here
1720		1720
1721	if ((pid = fork()) == 0) {	1721	if ((pid = fork()) == 0) {
1722	/* child */	1722	/* child */
1723	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY \| LOG_CONS, LOG_LOCAL4);	1723	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY, LOG_LOCAL4);
1724	prog = argv[0];	1724	prog = argv[0];
1725	argv[0] = const_cast<char*>(kid.name().termedBuf());	1725	argv[0] = const_cast<char*>(kid.name().termedBuf());
1726	execvp(prog, argv);	1726	execvp(prog, argv);
Lines 1733-1739 watch_child(char *argv[]) Link Here
1733	}	1733	}
1734		1734
1735	/* parent */	1735	/* parent */
1736	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY \| LOG_CONS, LOG_LOCAL4);	1736	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY, LOG_LOCAL4);
1737		1737
1738	squid_signal(SIGINT, SIG_IGN, SA_RESTART);	1738	squid_signal(SIGINT, SIG_IGN, SA_RESTART);
1739		1739

Lines 1019-1024 Link Here

(-)a/src/cf.data.pre (-2 / +3 lines)
1019	acl Safe_ports port 488 # gss-http	1019	acl Safe_ports port 488 # gss-http
1020	acl Safe_ports port 591 # filemaker	1020	acl Safe_ports port 591 # filemaker
1021	acl Safe_ports port 777 # multiling http	1021	acl Safe_ports port 777 # multiling http
		1022	acl Safe_ports port 901 # SWAT
1022	acl CONNECT method CONNECT	1023	acl CONNECT method CONNECT
1023	NOCOMMENT_END	1024	NOCOMMENT_END
1024	DOC_END	1025	DOC_END
Lines 5300-5310 Link Here
5300		5301
5301	NAME: cache_mgr	5302	NAME: cache_mgr
5302	TYPE: string	5303	TYPE: string
5303	DEFAULT: webmaster	5304	DEFAULT: root
5304	LOC: Config.adminEmail	5305	LOC: Config.adminEmail
5305	DOC_START	5306	DOC_START
5306	Email-address of local cache manager who will receive	5307	Email-address of local cache manager who will receive
5307	mail if the cache dies. The default is "webmaster".	5308	mail if the cache dies. The default is "root".
5308	DOC_END	5309	DOC_END
5309		5310
5310	NAME: mail_from	5311	NAME: mail_from