Merge remote-tracking branch 'origin/topic/v6-addr' into topic/dnthayer/ftp-ipv6

This commit is contained in:
Daniel Thayer 2012-02-15 16:29:31 -06:00
commit 2f2509fdce
12 changed files with 95 additions and 109 deletions

View file

@ -601,10 +601,10 @@ function add_signature_file(sold: string, snew: string): string
}
## Signature files to read. Use ``redef signature_files += "foo.sig"`` to
## extend. Signature files will be searched relative to ``BRO_PATH``.
## extend. Signature files will be searched relative to ``BROPATH``.
global signature_files = "" &add_func = add_signature_file;
## ``p0f`` fingerprint file to use. Will be searched relative to ``BRO_PATH``.
## ``p0f`` fingerprint file to use. Will be searched relative to ``BROPATH``.
const passive_fingerprint_file = "base/misc/p0f.fp" &redef;
# todo::testing to see if I can remove these without causing problems.