detect: fix setup for some keywords

Fix problems found by siginit.cocci.

diff --git a/src/detect-dce-iface.c b/src/detect-dce-iface.c
index 3e89feb5572d50efefe70cdf87d4c19b3e9aa0d1..06ae77c1f6449c8378dc102d0504a1ac8b6f1ce3 100644 (file)
--- a/src/detect-dce-iface.c
+++ b/src/detect-dce-iface.c
@@ -336,13 +336,13 @@ static int DetectDceIfaceSetup(DetectEngineCtx *de_ctx, Signature *s, char *arg)
     sm->type = DETECT_DCE_IFACE;
     sm->ctx = (void *)did;
 
-    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH);
-
     if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_DCERPC) {
         SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords.");
         goto error;
     }
 
+    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH);
+
     s->alproto = ALPROTO_DCERPC;
     /* Flagged the signature as to inspect the app layer data */
     s->flags |= SIG_FLAG_APPLAYER;

diff --git a/src/detect-dce-opnum.c b/src/detect-dce-opnum.c
index b650fe27ce4b743df0c0deaf5348ab3a65d12074..f25010893551a06f5d44982f40d2c1fbd0b363aa 100644 (file)
--- a/src/detect-dce-opnum.c
+++ b/src/detect-dce-opnum.c
@@ -306,13 +306,13 @@ static int DetectDceOpnumSetup(DetectEngineCtx *de_ctx, Signature *s, char *arg)
     sm->type = DETECT_DCE_OPNUM;
     sm->ctx = (void *)dod;
 
-    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH);
-
     if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_DCERPC) {
         SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords.");
         goto error;
     }
 
+    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH);
+
     s->alproto = ALPROTO_DCERPC;
     /* Flagged the signature as to inspect the app layer data */
     s->flags |= SIG_FLAG_APPLAYER;

diff --git a/src/detect-fileext.c b/src/detect-fileext.c
index e4f146e29f530710368abc7d849ba0755fa61c7b..484e6b8ab78aec7f117ec2b19c725fdf31aa10f5 100644 (file)
--- a/src/detect-fileext.c
+++ b/src/detect-fileext.c
@@ -209,13 +209,13 @@ static int DetectFileextSetup (DetectEngineCtx *de_ctx, Signature *s, char *str)
     sm->type = DETECT_FILEEXT;
     sm->ctx = (void *)fileext;
 
-    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_FILEMATCH);
-
     if (s->alproto != ALPROTO_HTTP && s->alproto != ALPROTO_SMTP) {
         SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords.");
         goto error;
     }
 
+    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_FILEMATCH);
+
     if (s->alproto == ALPROTO_HTTP) {
         AppLayerHtpNeedFileInspection();
     }

diff --git a/src/detect-filemd5.c b/src/detect-filemd5.c
index faedb11c0b0773e45e2b976ff48ff6577fc5571a..af149b4147d3efcc53e3cfab8a04c30743168652 100644 (file)
--- a/src/detect-filemd5.c
+++ b/src/detect-filemd5.c
@@ -322,13 +322,13 @@ static int DetectFileMd5Setup (DetectEngineCtx *de_ctx, Signature *s, char *str)
     sm->type = DETECT_FILEMD5;
     sm->ctx = (void *)filemd5;
 
-    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_FILEMATCH);
-
     if (s->alproto != ALPROTO_HTTP && s->alproto != ALPROTO_SMTP) {
         SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords.");
         goto error;
     }
 
+    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_FILEMATCH);
+
     if (s->alproto == ALPROTO_HTTP) {
         AppLayerHtpNeedFileInspection();
     }

diff --git a/src/detect-filename.c b/src/detect-filename.c
index 2bc9a09d4f38a252ce61c30e0ac62f4045ae9fae..780f073f952410d487f5648559f77ebafe69cdeb 100644 (file)
--- a/src/detect-filename.c
+++ b/src/detect-filename.c
@@ -213,13 +213,13 @@ static int DetectFilenameSetup (DetectEngineCtx *de_ctx, Signature *s, char *str
     sm->type = DETECT_FILENAME;
     sm->ctx = (void *)filename;
 
-    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_FILEMATCH);
-
     if (s->alproto != ALPROTO_HTTP && s->alproto != ALPROTO_SMTP) {
         SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords.");
         goto error;
     }
 
+    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_FILEMATCH);
+
     if (s->alproto == ALPROTO_HTTP) {
         AppLayerHtpNeedFileInspection();
     }

diff --git a/src/detect-filesize.c b/src/detect-filesize.c
index 92dcfebb9bae1e1b71cbb8189989e8bd8af6869c..6e9fe5fbb3449e488d268ef81b8143218ffb6c3f 100644 (file)
--- a/src/detect-filesize.c
+++ b/src/detect-filesize.c
@@ -287,13 +287,13 @@ static int DetectFilesizeSetup (DetectEngineCtx *de_ctx, Signature *s, char *str
     sm->type = DETECT_FILESIZE;
     sm->ctx = (SigMatchCtx *)fsd;
 
-    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_FILEMATCH);
-
     if (s->alproto != ALPROTO_HTTP && s->alproto != ALPROTO_SMTP) {
         SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords.");
         goto error;
     }
 
+    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_FILEMATCH);
+
     if (s->alproto == ALPROTO_HTTP) {
         AppLayerHtpNeedFileInspection();
     }

diff --git a/src/detect-ssl-version.c b/src/detect-ssl-version.c
index 5259187eb6e7590f7694fe26ddd362d8895038b4..e5957c12118bb76801f1d2093e61de195197b549 100644 (file)
--- a/src/detect-ssl-version.c
+++ b/src/detect-ssl-version.c
@@ -292,13 +292,13 @@ static int DetectSslVersionSetup (DetectEngineCtx *de_ctx, Signature *s, char *s
     sm->type = DETECT_AL_SSL_VERSION;
     sm->ctx = (void *)ssl;
 
-    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH);
-
     if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_TLS) {
         SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords.");
         goto error;
     }
 
+    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH);
+
     s->alproto = ALPROTO_TLS;
     return 0;
 

diff --git a/src/detect-tls-version.c b/src/detect-tls-version.c
index 200ba959f8980819eb708c83abc47022842a04fc..745bedefca6b32059883faff3fc37a3db0d6e7d2 100644 (file)
--- a/src/detect-tls-version.c
+++ b/src/detect-tls-version.c
@@ -228,13 +228,13 @@ static int DetectTlsVersionSetup (DetectEngineCtx *de_ctx, Signature *s, char *s
     sm->type = DETECT_AL_TLS_VERSION;
     sm->ctx = (void *)tls;
 
-    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH);
-
     if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_TLS) {
         SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords.");
         goto error;
     }
 
+    SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH);
+
     s->alproto = ALPROTO_TLS;
     return 0;