Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/fastpath'

Browse source 
* origin/fastpath:
  Add a missing "break" in OSFinger.cc
  Fix buffer sizes in the rotate_file function
This commit is contained in:
Jon Siwek 2018-09-20 13:15:15 -05:00
commit c75d1d0521
4 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,10 @@
2.6-beta2-6 | 2018-09-20 13:15:15 -0500
* Add a missing "break" in OSFinger.cc (Daniel Thayer)
* Fix buffer sizes in the rotate_file function (Daniel Thayer)
2.6-beta2-3 | 2018-09-19 15:21:00 -0500 2.6-beta2-3 | 2018-09-19 15:21:00 -0500
* Add HTTP::sqli_policy hook to ignore counting a request as a SQL injection * Add HTTP::sqli_policy hook to ignore counting a request as a SQL injection

2
VERSION
View file

@ -1 +1 @@
2.6-beta2-3 2.6-beta2-6

1
src/OSFinger.cc
View file

@ -469,6 +469,7 @@ reparse_ptr:
{ {
case 'E': case 'E':
Error("OS fingerprinting: Quirk 'E' is obsolete. Remove it, append E to the options. Line",(uint32)ln); Error("OS fingerprinting: Quirk 'E' is obsolete. Remove it, append E to the options. Line",(uint32)ln);
break;
case 'K': case 'K':
if ( mode != RST_FINGERPRINT_MODE ) if ( mode != RST_FINGERPRINT_MODE )

2
src/util.cc
View file

@ -1272,7 +1272,7 @@ FILE* rotate_file(const char* name, RecordVal* rotate_info)
// Build file names. // Build file names.
const int buflen = strlen(name) + 128; const int buflen = strlen(name) + 128;
char tmpname[buflen], newname[buflen+4]; char newname[buflen], tmpname[buflen+4];
safe_snprintf(newname, buflen, "%s.%d.%.06f.tmp", safe_snprintf(newname, buflen, "%s.%d.%.06f.tmp",
name, getpid(), network_time); name, getpid(), network_time);