Merge 2.5.x changes into trunk.

This commit is contained in:
b1v1r
2009-05-16 10:42:32 +00:00
parent 9d26b16e23
commit a16eb9677c
10 changed files with 1683 additions and 1400 deletions

View File

@@ -681,7 +681,7 @@ void msre_actionset_set_defaults(msre_actionset *actionset) {
if (actionset->msg == NOT_SET_P) actionset->msg = NULL;
if (actionset->logdata == NOT_SET_P) actionset->logdata = NULL;
if (actionset->phase == NOT_SET) actionset->phase = 2;
if (actionset->severity == -1); /* leave at -1 */
if (actionset->severity == -1) {} /* leave at -1 */
if (actionset->rule == NOT_SET_P) actionset->rule = NULL;
/* Flow */