Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-05 16:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

main: Properly close down SSL/sqlite at shutdown if net_run never started up

Browse source
This commit is contained in:
Tim Wojtulewicz 2019-08-26 10:31:17 -07:00
parent 7edebe179f
commit fa62e5b48c
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/main.cc
View file

@ -1101,24 +1101,20 @@ int main(int argc, char** argv)
done_with_network(); done_with_network();
net_delete(); net_delete();
terminate_bro();
sqlite3_shutdown();
ERR_free_strings();
EVP_cleanup();
CRYPTO_cleanup_all_ex_data();
// Close files after net_delete(), because net_delete()
// might write to connection content files.
BroFile::CloseOpenFiles();
}
else
{
terminate_bro();
} }
terminate_bro();
sqlite3_shutdown();
ERR_free_strings();
EVP_cleanup();
CRYPTO_cleanup_all_ex_data();
// Close files after net_delete(), because net_delete()
// might write to connection content files.
BroFile::CloseOpenFiles();
delete rule_matcher; delete rule_matcher;
return 0; return 0;