Attachment #665569 for bug #747088

Lines 32-40 PRESET_CXXFLAGS="$CXXFLAGS" Link Here

(-)a/configure.ac (-3 / +3 lines)
32	PRESET_LDFLAGS="$LDFLAGS"	32	PRESET_LDFLAGS="$LDFLAGS"
33		33
34	dnl Set default LDFLAGS	34	dnl Set default LDFLAGS
35	if test "x$LDFLAGS" = "x" ; then	35	dnl if test "x$LDFLAGS" = "x" ; then
36	LDFLAGS="-g"	36	dnl LDFLAGS="-g"
37	fi	37	dnl fi
38		38
39	# Check for GNU cc	39	# Check for GNU cc
40	AC_PROG_CC	40	AC_PROG_CC




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
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

Lines 490-496 _db_init(const char *logfile, const char Link Here

(-)a/src/debug.cc (-1 / +1 lines)
490	#if HAVE_SYSLOG && defined(LOG_LOCAL4)	490	#if HAVE_SYSLOG && defined(LOG_LOCAL4)
491		491
492	if (Debug::log_syslog)	492	if (Debug::log_syslog)
493	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY \| LOG_CONS, syslog_facility);	493	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY, syslog_facility);
494		494
495	#endif /* HAVE_SYSLOG */	495	#endif /* HAVE_SYSLOG */
496		496





    enter_suid();

    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);

    if (!opt_foreground)
        GoIntoBackground();


            if ((pid = fork()) == 0) {
                /* child */
                openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
                (void)execvp(masterCommand.arg0(), kidCommand.argv());
                int xerrno = errno;
                syslog(LOG_ALERT, "execvp failed: %s", xstrerr(xerrno));

        }

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

        // If Squid received a signal while checking for dying kids (below) or
        // starting new kids (above), then do a fast check for a new dying kid

Return to bug 747088

Lines 1633-1638 Link Here

(-)a/src/cf.data.pre (-2 / +3 lines)
1633	acl Safe_ports port 488 # gss-http	1633	acl Safe_ports port 488 # gss-http
1634	acl Safe_ports port 591 # filemaker	1634	acl Safe_ports port 591 # filemaker
1635	acl Safe_ports port 777 # multiling http	1635	acl Safe_ports port 777 # multiling http
		1636	acl Safe_ports port 901 # SWAT
1636	NOCOMMENT_END	1637	NOCOMMENT_END
1637	DOC_END	1638	DOC_END
1638		1639
Lines 7170-7180 Link Here
7170		7171
7171	NAME: cache_mgr	7172	NAME: cache_mgr
7172	TYPE: string	7173	TYPE: string
7173	DEFAULT: webmaster	7174	DEFAULT: root
7174	LOC: Config.adminEmail	7175	LOC: Config.adminEmail
7175	DOC_START	7176	DOC_START
7176	Email-address of local cache manager who will receive	7177	Email-address of local cache manager who will receive
7177	mail if the cache dies. The default is "webmaster".	7178	mail if the cache dies. The default is "root".
7178	DOC_END	7179	DOC_END
7179		7180
7180	NAME: mail_from	7181	NAME: mail_from

Lines 1912-1918 watch_child(const CommandLine &masterCom Link Here

(-)a/src/main.cc (-3 / +3 lines)
1912		1912
1913	enter_suid();	1913	enter_suid();
1914		1914
1915	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY \| LOG_CONS, LOG_LOCAL4);	1915	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY, LOG_LOCAL4);
1916		1916
1917	if (!opt_foreground)	1917	if (!opt_foreground)
1918	GoIntoBackground();	1918	GoIntoBackground();
Lines 2012-2018 watch_child(const CommandLine &masterCom Link Here
2012		2012
2013	if ((pid = fork()) == 0) {	2013	if ((pid = fork()) == 0) {
2014	/* child */	2014	/* child */
2015	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY \| LOG_CONS, LOG_LOCAL4);	2015	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY, LOG_LOCAL4);
2016	(void)execvp(masterCommand.arg0(), kidCommand.argv());	2016	(void)execvp(masterCommand.arg0(), kidCommand.argv());
2017	int xerrno = errno;	2017	int xerrno = errno;
2018	syslog(LOG_ALERT, "execvp failed: %s", xstrerr(xerrno));	2018	syslog(LOG_ALERT, "execvp failed: %s", xstrerr(xerrno));
Lines 2024-2030 watch_child(const CommandLine &masterCom Link Here
2024	}	2024	}
2025		2025
2026	/* parent */	2026	/* parent */
2027	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY \| LOG_CONS, LOG_LOCAL4);	2027	openlog(APP_SHORTNAME, LOG_PID \| LOG_NDELAY, LOG_LOCAL4);
2028		2028
2029	// If Squid received a signal while checking for dying kids (below) or	2029	// If Squid received a signal while checking for dying kids (below) or
2030	// starting new kids (above), then do a fast check for a new dying kid	2030	// starting new kids (above), then do a fast check for a new dying kid