diff --git a/CHANGES b/CHANGES index be5c90551a..c0625da541 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,12 @@ +7.0.0-dev.196 | 2024-04-29 09:09:28 -0700 + + * Fix cid propagation into files.log (Johanna Amann, Corelight) + + Changes to the connection id were not propagated to files.log in all + cases. + + Fixes GH-3700 + 7.0.0-dev.194 | 2024-04-29 09:08:20 -0700 * factored BTest constants into globals to prevent premature ZAM optimization when testing (Vern Paxson, Corelight) diff --git a/VERSION b/VERSION index f7824b07c6..31e258fdc1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.0-dev.194 +7.0.0-dev.196 diff --git a/scripts/base/frameworks/files/main.zeek b/scripts/base/frameworks/files/main.zeek index baefdfeecb..31da1a7b51 100644 --- a/scripts/base/frameworks/files/main.zeek +++ b/scripts/base/frameworks/files/main.zeek @@ -603,7 +603,7 @@ event file_state_remove(f: fa_file) &priority=-10 # by reference in Log::write() rather than by copy. local info = |f$conns| > 1 ? copy(f$info) : f$info; info$uid = c$uid; - info$id = cid; + info$id = c$id; Log::write(Files::LOG, info); } }