Improve robustness of daemon interval extraction
Without this change the init script incorrectly handles config file lines like these: foo=bar # daemon=123 foodaemon=123 daemonfoo=123 daemon=0 DAEMON=123
This commit is contained in:
parent
cecbaba3e0
commit
e7c43e9eef
1 changed files with 15 additions and 3 deletions
|
@ -34,11 +34,23 @@ export PATH
|
||||||
# See how we were called.
|
# See how we were called.
|
||||||
case "$1" in
|
case "$1" in
|
||||||
start)
|
start)
|
||||||
# Start daemon.
|
# See if daemon=value is specified in the config file.
|
||||||
DELAY=`grep -v '^\s*#' $CONF | grep -i -m 1 "daemon" | awk -F '=' '{print $2}'`
|
# Assumptions:
|
||||||
if [ -z "$DELAY" ]; then
|
# * there are no quoted "#" characters before "daemon="
|
||||||
|
# (if there is a "#" it starts a comment)
|
||||||
|
# * "daemon=" does not appear in a password or value
|
||||||
|
# * if the interval value is 0, it is not quoted
|
||||||
|
INTERVAL=$(sed -e '
|
||||||
|
s/^\([^#]*[,[:space:]]\)\{0,1\}daemon=\([^,[:space:]]*\).*$/\2/
|
||||||
|
t quit
|
||||||
|
d
|
||||||
|
:quit
|
||||||
|
q
|
||||||
|
' "$CONF")
|
||||||
|
if [ -z "$DELAY" ] || [ "$DELAY" = "0" ]; then
|
||||||
DELAY="-daemon 300"
|
DELAY="-daemon 300"
|
||||||
else
|
else
|
||||||
|
# use the interval specified in the config file
|
||||||
DELAY=''
|
DELAY=''
|
||||||
fi
|
fi
|
||||||
echo -n "Starting ddclient: "
|
echo -n "Starting ddclient: "
|
||||||
|
|
Loading…
Reference in a new issue