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

Merge branch 'topic/vlad/doc_tweaks'

Browse source 
* topic/vlad/doc_tweaks:
  docs: escape * in documentation
  Update the mail_dest documentation with the new email_dest field
This commit is contained in:
Christian Kreibich 2021-07-09 12:01:40 -07:00
commit 281eef398f
4 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGES
View file

@ -1,3 +1,10 @@
4.1.0-dev.921 | 2021-07-09 12:01:40 -0700
* docs: escape * in documentation (Vlad Grigorescu)
* Update the mail_dest documentation with the new email_dest field (Vlad Grigorescu)
4.1.0-dev.918 | 2021-07-08 18:00:26 -0700 4.1.0-dev.918 | 2021-07-08 18:00:26 -0700
* Fix a compile warning on FreeBSD (Tim Wojtulewicz, Corelight) * Fix a compile warning on FreeBSD (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
4.1.0-dev.918 4.1.0-dev.921

5
scripts/base/frameworks/notice/main.zeek
View file

@ -202,11 +202,12 @@ export {
## ##
## Note that this is overridden by the ZeekControl SendMail option. ## Note that this is overridden by the ZeekControl SendMail option.
option sendmail = "/usr/sbin/sendmail"; 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 ## :zeek:enum:`Notice::ACTION_EMAIL` action or to send bulk alarm logs
## on rotation with :zeek:enum:`Notice::ACTION_ALARM`. ## 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; const mail_dest = "" &redef;
## Address that emails will be from. ## Address that emails will be from.

2
src/file_analysis/analyzer/x509/functions.bif
View file

@ -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 ## 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 ## 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 ## 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 ## hostname: Hostname to test
## ##