apachectl: Fix a problem finding envvars if sbindir != bindir.

PR:            30723
Submitted by:  Friedrich Haubensak <hsk imb-jena.de>
Reviewed by:   Jeff Trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104701 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index eb1e5d62ec6cc4173b140283e611669aaba96e18..789b547ab16115b184e2c9f485707d243276483f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) apachectl: Fix a problem finding envvars if sbindir != bindir.
+     PR 30723.  [Friedrich Haubensak <hsk imb-jena.de>]
+
   *) mod_ssl: Add SSL_CLIENT_V_REMAIN variable, representing the
      number of days until the client cert expires.  [Joe Orton]
 

diff --git a/support/apachectl.in b/support/apachectl.in
index 8a959c6891d257dbaef94bd50d946d5388ce9ffc..eb9be2052ee0ad84c7ec0da845988672d011e359 100644 (file)
--- a/support/apachectl.in
+++ b/support/apachectl.in
@@ -43,8 +43,8 @@ ARGV="$@"
 HTTPD='@exp_sbindir@/@progname@'
 #
 # pick up any necessary environment variables
-if test -f @exp_bindir@/envvars; then
-  . @exp_bindir@/envvars
+if test -f @exp_sbindir@/envvars; then
+  . @exp_sbindir@/envvars
 fi
 #
 # a command that outputs a formatted text version of the HTML at the