Merge remote branch 'remotes/origin/topic/bro_dns_fake_message'

* remotes/origin/topic/bro_dns_fake_message:
  Reworded BRO_DNS_FAKE message.
  Added a BRO_DNS_FAKE message to the help output.

Changed to show on/off rather than the variable's content.
This commit is contained in:
Robin Sommer 2011-01-19 17:29:25 -08:00
commit 8e7d0617a1
3 changed files with 14 additions and 1 deletions

View file

@ -1,3 +1,7 @@
1.6-dev.20 Wed Jan 19 17:30:11 PST 2011
* BRO_DNS_FAKE is now listed in the --help output. (Seth Hall)
1.6-dev.18 Wed Jan 19 16:37:13 PST 2011 1.6-dev.18 Wed Jan 19 16:37:13 PST 2011
* Removing unnecessary expire timer from http_sessions. (Gregor * Removing unnecessary expire timer from http_sessions. (Gregor

View file

@ -1 +1 @@
1.6-dev.18 1.6-dev.20

View file

@ -122,6 +122,14 @@ const char* bro_version()
#endif #endif
} }
const char* bro_dns_fake()
{
if ( ! getenv("BRO_DNS_FAKE") )
return "off";
else
return "on";
}
void usage() void usage()
{ {
fprintf(stderr, "bro version %s\n", bro_version()); fprintf(stderr, "bro version %s\n", bro_version());
@ -184,6 +192,7 @@ void usage()
fprintf(stderr, " $BROPATH | file search path (%s)\n", bro_path()); fprintf(stderr, " $BROPATH | file search path (%s)\n", bro_path());
fprintf(stderr, " $BRO_PREFIXES | prefix list (%s)\n", bro_prefixes()); fprintf(stderr, " $BRO_PREFIXES | prefix list (%s)\n", bro_prefixes());
fprintf(stderr, " $BRO_DNS_FAKE | disable DNS lookups (%s)\n", bro_dns_fake());
exit(1); exit(1);
} }