From 314e9c41f9dcdb2d7aa51139036c40a3b2e34f9f Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Wed, 26 Oct 2011 14:39:07 -0700 Subject: [PATCH] Removing debugging code. --- aux/bro-aux | 2 +- aux/broccoli | 2 +- aux/broctl | 2 +- scripts/base/frameworks/notice/actions/pp-alarms.bro | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/aux/bro-aux b/aux/bro-aux index 4d4df8818c..30d59813ad 160000 --- a/aux/bro-aux +++ b/aux/bro-aux @@ -1 +1 @@ -Subproject commit 4d4df8818c184c5ef0ea20466f137e2a7f13de23 +Subproject commit 30d59813ada9294867b89b7f335ef52651be683d diff --git a/aux/broccoli b/aux/broccoli index d2c2828772..13c87ac2f4 160000 --- a/aux/broccoli +++ b/aux/broccoli @@ -1 +1 @@ -Subproject commit d2c2828772a17b55f445d7a36bd6657205d113b3 +Subproject commit 13c87ac2f4561c77562bfaf8816caad0c2651291 diff --git a/aux/broctl b/aux/broctl index e4fef7ed45..a59d4ee1dd 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit e4fef7ed45b185c6805b4a163b274d192d8206d5 +Subproject commit a59d4ee1ddc4dcde54cb3e3cedea870314a3b380 diff --git a/scripts/base/frameworks/notice/actions/pp-alarms.bro b/scripts/base/frameworks/notice/actions/pp-alarms.bro index e60b41eb86..e932fcb54f 100644 --- a/scripts/base/frameworks/notice/actions/pp-alarms.bro +++ b/scripts/base/frameworks/notice/actions/pp-alarms.bro @@ -30,7 +30,6 @@ global pp_alarms_open: bool = F; # Returns True if pretty-printed alarm summaries are activated. function want_pp() : bool { - return T; return (pretty_print_alarms && ! reading_traces() && (mail_dest != "" || mail_dest_pretty_printed != "")); } @@ -60,8 +59,8 @@ function pp_send() write_file(pp_alarms, "\n\n--\n[Automatically generated]\n\n"); close(pp_alarms); - #system(fmt("/bin/cat %s | %s -t -oi && /bin/rm %s", - # pp_alarms_name, sendmail, pp_alarms_name)); + system(fmt("/bin/cat %s | %s -t -oi && /bin/rm %s", + pp_alarms_name, sendmail, pp_alarms_name)); pp_alarms_open = F; }