From 743d4672bd2dd4e1cae45dc35a88f436e692e828 Mon Sep 17 00:00:00 2001 From: Johanna Amann Date: Thu, 23 Jun 2016 13:07:31 -0700 Subject: [PATCH] SMTP does not need to pull in the notice framework. This caused test baseline changes in one of the test: notice now ties in netcontrol due to ACTION_DROP. Catch and release uses the new_connection event, which was not before triggered and can cause uids to be generated for connections that are not usually assigned uids in bare mode. --- scripts/base/protocols/smtp/main.bro | 1 - scripts/policy/protocols/smtp/blocklists.bro | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/base/protocols/smtp/main.bro b/scripts/base/protocols/smtp/main.bro index a4b290fc89..cd0e730d8e 100644 --- a/scripts/base/protocols/smtp/main.bro +++ b/scripts/base/protocols/smtp/main.bro @@ -1,4 +1,3 @@ -@load base/frameworks/notice @load base/utils/addrs @load base/utils/directions-and-hosts @load base/utils/email diff --git a/scripts/policy/protocols/smtp/blocklists.bro b/scripts/policy/protocols/smtp/blocklists.bro index 57aef4ee48..aa7b951cbb 100644 --- a/scripts/policy/protocols/smtp/blocklists.bro +++ b/scripts/policy/protocols/smtp/blocklists.bro @@ -1,6 +1,7 @@ -##! Watch for various SPAM blocklist URLs in SMTP error messages. +##! Watch for various SPAM blocklist URLs in SMTP error messages. @load base/protocols/smtp +@load base/frameworks/notice module SMTP;