projects
/
ossec-hids.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
novi upstream verzije 2.8.3
[ossec-hids.git]
/
src
/
init
/
update.sh
diff --git
a/src/init/update.sh
b/src/init/update.sh
index
61ff28e
..
0e0b078
100755
(executable)
--- a/
src/init/update.sh
+++ b/
src/init/update.sh
@@
-46,10
+46,10
@@
doUpdatecleanup()
fi
# Checking if the directory is valid.
fi
# Checking if the directory is valid.
- local _dir_pattern="^/[-a-zA-Z0-9/\.-]{3,128}$"
- echo $DIRECTORY | grep -E "$_dir_pattern" > /dev/null 2>&1
+ _dir_pattern_update="^/[-a-zA-Z0-9/\.-]{3,128}$"
+ echo $DIRECTORY | grep -E "$_dir_pattern_update" > /dev/null 2>&1
if [ ! $? = 0 ]; then
if [ ! $? = 0 ]; then
- echo "# ($FUNCNAME) ERROR: directory name ($DIRECTORY) doesn't match the pattern $_dir_pattern" 1>&2
+ echo "# ($FUNCNAME) ERROR: directory name ($DIRECTORY) doesn't match the pattern $_dir_pattern_update" 1>&2
echo "${FALSE}"
return 1;
fi
echo "${FALSE}"
return 1;
fi
@@
-139,7
+139,7
@@
UpdateOSSECRules()
grep -E '<decoder>|<decoder_dir|<rule_dir>' ${OSSEC_CONF_FILE} | grep -v '<!--' >> "${OSSEC_CONF_FILE}.$$.tmp2"
# Check for custom files that may have been added in <rules> element
grep -E '<decoder>|<decoder_dir|<rule_dir>' ${OSSEC_CONF_FILE} | grep -v '<!--' >> "${OSSEC_CONF_FILE}.$$.tmp2"
# Check for custom files that may have been added in <rules> element
- for i in $(grep -E '<include>|<list>' ${OSSEC_CONF_FILE} | grep -v '<!--')
+ for i in `grep -E '<include>|<list>' ${OSSEC_CONF_FILE} | grep -v '<!--'`
do
grep "$i" ${RULES_TEMPLATE}>/dev/null || echo " $i" >> "${OSSEC_CONF_FILE}.$$.tmp2"
done
do
grep "$i" ${RULES_TEMPLATE}>/dev/null || echo " $i" >> "${OSSEC_CONF_FILE}.$$.tmp2"
done