[gentoo-commits] proj/apache:master commit in: 2.4/init/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     1a07d157d19dbd400d27946f89adb67c149ddf52
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 14:59:41 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar  3 12:46:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/apache.git/commit/?id=1a07d157

apache2.initd: remove config file readability check.

In checkconfd(), the apache2 init script checks to make sure that
$CONFIGFILE is readable. To do this, it needs to reimplement the
relative path handling that apache2 already does. If we remove the
relative path handling from checkconfd(), then apache2 continues to do
the right thing when $CONFIGFILE is relative. However, our custom
readability check fails, since it is looking for an absolute path
that doesn't exist.

Fortunately, apache2 already checks to ensure that the configuration
file exists and is readable. If we remove the custom readability check
entirely, then we get an error like,

   * apache2 has detected an error in your setup:
  apache2: Could not open configuration file
  /usr/lib/apache2/example.conf: No such file or directory

This is not sufficiently worse than the custom error:

  Unable to read configuration file: example.conf

Therefore the custom readability check is removed in this commit, and
we can avoid reimplementing the relative path handling as well.

 2.4/init/apache2.initd | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/2.4/init/apache2.initd b/2.4/init/apache2.initd
index f49245c..0a1e6a0 100755
--- a/2.4/init/apache2.initd
+++ b/2.4/init/apache2.initd
@@ -38,11 +38,6 @@ checkconfd() {
 	fi
 
 	CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}"
-	[ "${CONFIGFILE#/}" = "${CONFIGFILE}" ] && CONFIGFILE="${SERVERROOT}/${CONFIGFILE}"
-	if [ ! -r "${CONFIGFILE}" ]; then
-		eerror "Unable to read configuration file: ${CONFIGFILE}"
-		return 1
-	fi
 
 	APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT}"
 	APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}"