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

diff --cc src/parser/parse_rule.cc
index 888de798292a6e9bfc35e1513807c1013029176f,ca300c10ed739c31a8001e41be86c972dc9b5ef8..d7f3c6c2cdb6a86fc1c31be36512be920ce45b2b
--- 1/src/parser/parse_rule.cc
--- 2/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++;