From: Russ Combs <rucombs@cisco.com>
Date: Mon, 25 Aug 2014 16:26:48 +0000 (-0400)
Subject: Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
X-Git-Tag: 3.0.0-233~1419^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3286bced161f7b1c94da6f480a4e7192b7b1c7f;p=thirdparty%2Fsnort3.git

Merge branch 'master' of 10.6.12.29:/nfs/home/jrosenba/codecs
---

b3286bced161f7b1c94da6f480a4e7192b7b1c7f
diff --cc src/parser/parse_rule.cc
index 888de7982,ca300c10e..d7f3c6c2c
--- a/src/parser/parse_rule.cc
+++ b/src/parser/parse_rule.cc
@@@ -1566,11 -1561,9 +1566,12 @@@ const char* parse_rule_close(SnortConfi
      }
      else
      {
 +        if ( !otn->sigInfo.generator )
 +            ParseError("gid must set in builtin rules");
 +
          if ( otn->num_detection_opts )
-             ParseError("builtin rules do not support detection options");
+             ParseError("%d:%d builtin rules do not support detection options",
+                         otn->sigInfo.generator, otn->sigInfo.id);
  
          otn->sigInfo.text_rule = false;
          builtin_rule_count++;