From: Anoop Saldanha <poonaatsoc@gmail.com>
Date: Mon, 21 May 2012 19:25:02 +0000 (+0530)
Subject: bug #454 - rebase fix. Also use better error code to indicate invalid address var... 
X-Git-Tag: suricata-1.3beta2~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=468978334289ef9e95e1cbdd2cdc678301e2ed8e;p=thirdparty%2Fsuricata.git

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

diff --git a/src/detect-engine-address.c b/src/detect-engine-address.c
index ac71a321be..a1c091cd92 100644
--- 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 07295aeb3d..2b231b3c37 100644
--- 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 80e6377aea..9ef6a1a65c 100644
--- 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);