Fix bug in logging msg when using --init-errors-fatal

remotes/origin/master-1.0.x
Gerardo Iglesias Galvan 15 years ago committed by Victor Julien
parent 5eb819b0f4
commit 40c514f295

@ -804,10 +804,6 @@ error:
SigFree(sig->next); SigFree(sig->next);
SigFree(sig); SigFree(sig);
} }
if (de_ctx->failure_fatal == 1) {
SCLogError(SC_ERR_INVALID_SIGNATURE,"Signature init failed \"%s\"",sigstr);
exit(EXIT_FAILURE);
}
/* if something failed, restore the old signum count /* if something failed, restore the old signum count
* since we didn't install it */ * since we didn't install it */
de_ctx->signum = oldsignum; de_ctx->signum = oldsignum;
@ -852,10 +848,6 @@ Signature *DetectEngineAppendSig(DetectEngineCtx *de_ctx, char *sigstr) {
error: error:
if ( sig != NULL ) SigFree(sig); if ( sig != NULL ) SigFree(sig);
if (de_ctx->failure_fatal == 1) {
SCLogError(SC_ERR_INVALID_SIGNATURE,"Signature init failed %s ",sigstr);
exit(EXIT_FAILURE);
}
return NULL; return NULL;
} }

@ -274,6 +274,9 @@ int DetectLoadSigFile(DetectEngineCtx *de_ctx, char *sig_file, int *sigs_tot) {
good++; good++;
} else { } else {
SCLogError(SC_ERR_INVALID_SIGNATURE, "Error parsing signature \"%s\" from file %s at line %"PRId32"", line, sig_file, lineno - multiline); SCLogError(SC_ERR_INVALID_SIGNATURE, "Error parsing signature \"%s\" from file %s at line %"PRId32"", line, sig_file, lineno - multiline);
if (de_ctx->failure_fatal == 1) {
exit(EXIT_FAILURE);
}
bad++; bad++;
} }
multiline = 0; multiline = 0;

Loading…
Cancel
Save