]> granicus.if.org Git - apache/commit
Merge r1341905, r1342065, r1341930, r1345147, r1344712, r1814465 from trunk:
authorJim Jagielski <jim@apache.org>
Wed, 30 May 2018 19:09:00 +0000 (19:09 +0000)
committerJim Jagielski <jim@apache.org>
Wed, 30 May 2018 19:09:00 +0000 (19:09 +0000)
commita7f818f5e393d361ad61008a09471f6e2177828b
tree95050171d3af20e04a65d7bc28d56ff587bf7878
parentcdb8efa1e7e55814a5f845e46b5f63916e87b045
Merge r1341905, r1342065, r1341930, r1345147, r1344712, r1814465 from trunk:

suexec: Add support for logging to syslog as an alternative to a
logfile.

* support/suexec.c (err_output) [AP_LOG_SYSLOG]: Log to syslog.
  (main): Close syslog fd if open, before execv.  Add -V output
  for AP_LOG_SYSLOG.

* configure.in: Add --with-suexec-syslog argument; allow
  --without-suexec-logfile to omit definition of AP_LOG_EXEC.

suexec: Support use of setgid/setuid capability bits on Linux, a
weaker set of privileges than the full setuid/setgid root binary.

* configure.in: Add --enable-suexec-capabilites flag.

* Makefile.in: If configured, use setcap instead of chmod 7555 on
  installed suexec binary.

* modules/arch/unix/mod_unixd.c (unixd_pre_config): Drop test for
  setuid bit if capability bits are used.

* docs/manual/: Add docs.

* docs/manual/suexec.html.en: Update for syslog logging.

* configure.in: Correct handling of --with-suexec-logfile in r1341905,
  thanks to rpluem.

* support/suexec.c: Define AP_LOG_FACILITY.
  (err_output): Use AP_LOG_FACILITY for syslog facility.

Suggested by: kbrand

* configure.in: Fix help text for --with-suexec-syslog.

Submitted by: jorton
Reviewed by: jorton, ylavic, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832565 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
Makefile.in
STATUS
configure.in
docs/manual/suexec.html.en
modules/arch/unix/mod_unixd.c
support/suexec.c