bug #454 - rebase fix. Also use better error code to indicate invalid address var...

diff --git a/src/detect-engine-address.c b/src/detect-engine-address.c
index ac71a321be237e080e07d50205fe94be41156198..a1c091cd9249221f4c0faf289f9bba268839d087 100644 (file)
--- a/src/detect-engine-address.c
+++ b/src/detect-engine-address.c
@@ -1257,7 +1257,7 @@ int DetectAddressTestConfVars(void)
         }
 
         if (DetectAddressIsCompleteIPSpace(ghn)) {
-            SCLogError(SC_ERR_ADDRESS_ENGINE_GENERIC,
+            SCLogError(SC_ERR_INVALID_YAML_CONF_ENTRY,
                        "Address var - \"%s\" has the complete IP space negated "
                        "with it's value \"%s\".  Rule address range is NIL. "
                        "Probably have a !any or an address range that supplies "

diff --git a/src/detect-engine-port.c b/src/detect-engine-port.c
index 07295aeb3d87fa74ea61fce5a79131fbb0cba2f9..2b231b3c3751bf0a14699d1157525999b75a1120 100644 (file)
--- a/src/detect-engine-port.c
+++ b/src/detect-engine-port.c
@@ -1314,7 +1314,7 @@ int DetectPortTestConfVars(void)
         }
 
         if (DetectPortIsCompletePortSpace(ghn)) {
-            SCLogError(SC_ERR_PORT_ENGINE_GENERIC,
+            SCLogError(SC_ERR_INVALID_YAML_CONF_ENTRY,
                        "Port var - \"%s\" has the complete Port range negated "
                        "with it's value \"%s\".  Port space range is NIL. "
                        "Probably have a !any or a port range that supplies "

diff --git a/src/util-error.c b/src/util-error.c
index 80e6377aeafce00f7d17d59df2af76f2b7f2a6ef..9ef6a1a65c5a5cad9fb74f48e98591cc8de4dbdd 100644 (file)
--- a/src/util-error.c
+++ b/src/util-error.c
@@ -102,7 +102,6 @@ const char * SCErrorToString(SCError err)
         CASE_CODE (SC_ERR_ADDRESS_ENGINE_GENERIC);
         CASE_CODE (SC_ERR_PORT_ENGINE_GENERIC);
         CASE_CODE (SC_ERR_FAST_LOG_GENERIC);
-        CASE_CODE (SC_ERR_ADDRESS_ENGINE_GENERIC);
         CASE_CODE (SC_ERR_IPONLY_RADIX);
         CASE_CODE (SC_ERR_DEBUG_LOG_GENERIC);
         CASE_CODE (SC_ERR_UNIFIED_LOG_GENERIC);