automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@15657 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
index 615ec2746524cc02ce05dbc09d6447757f666ada..32dc8e0c69700ed030690fd3fd4c460fe7eb5f93 100755 (executable)
--- a/contrib/init.d/rc.redhat.asterisk
+++ b/contrib/init.d/rc.redhat.asterisk
@@ -43,7 +43,7 @@ if ! [ -x $AST_SBIN/asterisk ] ; then
 fi
 
 if ! [ -d $AST_CONFIG ] ; then
-       echo "ERROR: /etc/asterisk directory not found"
+       echo "ERROR: $AST_CONFIG directory not found"
        exit 0
 fi
 
@@ -58,7 +58,7 @@ SAFE_ASTERISK=$AST_SBIN/safe_asterisk
 
 # Allow configuration overrides in /etc/sysconfig/asterisk
 CONFIG0=`readlink $0`
-if [ $CONFIG0 = "" ]; then
+if [ "$CONFIG0" = "" ]; then
        CONFIGFILE=/etc/sysconfig/`basename $0`
 else
        CONFIGFILE=/etc/sysconfig/`basename $CONFIG0`