From 10159a3fdffa455d5b712376998e0a28d7073bf6 Mon Sep 17 00:00:00 2001 From: Vlad Grigorescu Date: Thu, 8 Jul 2021 16:01:21 -0500 Subject: [PATCH 1/2] Update the mail_dest documentation with the new email_dest field --- scripts/base/frameworks/notice/main.zeek | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/base/frameworks/notice/main.zeek b/scripts/base/frameworks/notice/main.zeek index 09e3749d2f..ebf3e29424 100644 --- a/scripts/base/frameworks/notice/main.zeek +++ b/scripts/base/frameworks/notice/main.zeek @@ -202,11 +202,12 @@ export { ## ## Note that this is overridden by the ZeekControl SendMail option. option sendmail = "/usr/sbin/sendmail"; - ## Email address to send notices with the + ## The default email address to send notices with the ## :zeek:enum:`Notice::ACTION_EMAIL` action or to send bulk alarm logs ## on rotation with :zeek:enum:`Notice::ACTION_ALARM`. ## - ## Note that this is overridden by the ZeekControl MailTo option. + ## Note that this is overridden by the ZeekControl MailTo option or by + ## the `email_dest` field in the :zeek:see:`Notice::Info` record. const mail_dest = "" &redef; ## Address that emails will be from. From 8d2a6f48e888df25c49381fd9c475967fe99076b Mon Sep 17 00:00:00 2001 From: Vlad Grigorescu Date: Thu, 8 Jul 2021 18:26:42 -0500 Subject: [PATCH 2/2] docs: escape * in documentation --- src/file_analysis/analyzer/x509/functions.bif | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/file_analysis/analyzer/x509/functions.bif b/src/file_analysis/analyzer/x509/functions.bif index fb49705bf8..2a41969e21 100644 --- a/src/file_analysis/analyzer/x509/functions.bif +++ b/src/file_analysis/analyzer/x509/functions.bif @@ -977,7 +977,7 @@ function x509_set_certificate_cache_hit_callback%(f: string_any_file_hook%) : bo ## our interpretation of RFC6128 wildcard expansions. This specifically means that wildcards are ## only allowed in the leftmost label, wildcards only span one label, the wildcard has to be the ## last character before the label-separator, but additional characters are allowed before it, and -## the wildcard has to be at least at the third level (so *.a.b). +## the wildcard has to be at least at the third level (so \*.a.b). ## ## hostname: Hostname to test ##