Merge remote branch 'origin/master' into topic/robin/logging-internals

This commit is contained in:
Robin Sommer 2011-02-20 17:18:06 -08:00
commit c015605113
29 changed files with 1696 additions and 795 deletions

View file

@ -8,6 +8,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <signal.h>
#include <string.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
@ -424,7 +425,7 @@ int main(int argc, char** argv)
prog = argv[0];
prefixes.append(""); // "" = "no prefix"
prefixes.append(strdup("")); // "" = "no prefix"
char* p = getenv("BRO_PREFIXES");
if ( p )