Skip to content

Commit

Permalink
merge from dcid 2012-07-30
Browse files Browse the repository at this point in the history
  • Loading branch information
jbcheng committed Jul 31, 2012
2 parents faf34bc + e9eebe9 commit 4cc5354
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 2 deletions.
5 changes: 5 additions & 0 deletions etc/rules/pam_rules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@
<description>PAM misconfiguration.</description>
</rule>

<rule id="5555" level="3">
<match>: password changed for</match>
<description>User changed password.</description>
</rule>


</group> <!-- SYSLOG,pam -->

Expand Down
1 change: 1 addition & 0 deletions src/agentlessd/scripts/register_host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ elif [ "x$1" = "xadd" ]; then
echo "ERROR: Unable to creating entry (echo failed)."
exit 1;
fi
chmod 744 $MYPASS
echo "*Host $2 added."

else
Expand Down
2 changes: 1 addition & 1 deletion src/analysisd/analysisd.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ int main_analysisd(int argc, char **argv)
}

/* going on Daemon mode */
if(!test_config || !run_foreground)
if(!test_config && !run_foreground)
{
nowDaemon();
goDaemon();
Expand Down
1 change: 1 addition & 0 deletions src/analysisd/dodiff.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ int doDiff(RuleInfo *currently_rule, Eventinfo *lf)
currently_rule->last_events[0] = NULL;



if(lf->hostname[0] == '(')
{
htpt = strchr(lf->hostname, ')');
Expand Down
2 changes: 1 addition & 1 deletion src/analysisd/testrule.c
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ void OS_ReadMSG(int m_queue, char *ut_str)
char holder[1024];
holder[1] = '\0';
exit_code = 3;
if(strcasecmp(ut_decoder_name, lf->decoder_info->name) == 0)
if(lf->decoder_info->name != NULL && strcasecmp(ut_decoder_name, lf->decoder_info->name) == 0)
{
exit_code--;
snprintf(holder, 1023, "%d", currently_rule->sigid);
Expand Down

0 comments on commit 4cc5354

Please sign in to comment.