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

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 "

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 "

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);