projects
/
ossec-hids.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new upstream release (3.3.0); modify package compatibility for Stretch
[ossec-hids.git]
/
src
/
init
/
update.sh
diff --git
a/src/init/update.sh
b/src/init/update.sh
index
61ff28e
..
65d1691
100755
(executable)
--- a/
src/init/update.sh
+++ b/
src/init/update.sh
@@
-1,16
+1,10
@@
#!/bin/sh
# Shell script update functions for the OSSEC HIDS
# Author: Daniel B. Cid <daniel.cid@gmail.com>
#!/bin/sh
# Shell script update functions for the OSSEC HIDS
# Author: Daniel B. Cid <daniel.cid@gmail.com>
-# Last modification: May 24, 2006
-
FALSE="false"
TRUE="true"
FALSE="false"
TRUE="true"
-
-##########
-# isUpdate
-##########
isUpdate()
{
ls -la ${OSSEC_INIT} > /dev/null 2>&1
isUpdate()
{
ls -la ${OSSEC_INIT} > /dev/null 2>&1
@@
-31,10
+25,6
@@
isUpdate()
return 1;
}
return 1;
}
-
-##########
-# doUpdatecleanup
-##########
doUpdatecleanup()
{
. ${OSSEC_INIT}
doUpdatecleanup()
{
. ${OSSEC_INIT}
@@
-46,19
+36,15
@@
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
}
-
-##########
-# getPreinstalled
-##########
getPreinstalled()
{
. ${OSSEC_INIT}
getPreinstalled()
{
. ${OSSEC_INIT}
@@
-80,10
+66,6
@@
getPreinstalled()
return 0;
}
return 0;
}
-
-##########
-# getPreinstalledDir
-##########
getPreinstalledDir()
{
. ${OSSEC_INIT}
getPreinstalledDir()
{
. ${OSSEC_INIT}
@@
-91,10
+73,6
@@
getPreinstalledDir()
return 0;
}
return 0;
}
-
-##########
-# UpdateStartOSSEC
-##########
UpdateStartOSSEC()
{
. ${OSSEC_INIT}
UpdateStartOSSEC()
{
. ${OSSEC_INIT}
@@
-102,10
+80,6
@@
UpdateStartOSSEC()
$DIRECTORY/bin/ossec-control start
}
$DIRECTORY/bin/ossec-control start
}
-
-##########
-# UpdateStopOSSEC
-##########
UpdateStopOSSEC()
{
. ${OSSEC_INIT}
UpdateStopOSSEC()
{
. ${OSSEC_INIT}
@@
-120,9
+94,6
@@
UpdateStopOSSEC()
rm -f $DIRECTORY/queue/syscheck/.* > /dev/null 2>&1
}
rm -f $DIRECTORY/queue/syscheck/.* > /dev/null 2>&1
}
-##########
-# UpdateOSSECRules
-##########
UpdateOSSECRules()
{
. ${OSSEC_INIT}
UpdateOSSECRules()
{
. ${OSSEC_INIT}
@@
-139,7
+110,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
@@
-155,3
+126,4
@@
UpdateOSSECRules()
echo "</ossec_config> <!-- rules global entry -->" >> ${OSSEC_CONF_FILE}
rm "${OSSEC_CONF_FILE}.$$.tmp2"
}
echo "</ossec_config> <!-- rules global entry -->" >> ${OSSEC_CONF_FILE}
rm "${OSSEC_CONF_FILE}.$$.tmp2"
}
+