From 77435d2724c1abd79668e7b24e7c2133139581ec Mon Sep 17 00:00:00 2001
From: Seth Hall <seth@remor.com>
Date: Thu, 7 Jul 2011 21:24:51 -0400
Subject: [PATCH] Removing more vestiges of BroCtl from Bro.

---
 bro-path-dev.in                                 | 8 +++-----
 policy/frameworks/cluster/base/node/manager.bro | 7 -------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/bro-path-dev.in b/bro-path-dev.in
index 5499f48860..18530bc48a 100755
--- a/bro-path-dev.in
+++ b/bro-path-dev.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # After configured by CMake, this file prints the absolute path to policy
-# files that come with the source distributions of Bro and Broctl as well
-# as policy files that are generated by the BIF compiler at compile time
+# files that come with the source distributions of Bro as well as policy 
+# files that are generated by the BIF compiler at compile time.
 #
 # The intended use of this script is to make it easier to run Bro from
 # the build directory, avoiding the need to install it.  This could be
@@ -14,8 +14,6 @@ broPolicies=${PROJECT_SOURCE_DIR}/policy:${PROJECT_SOURCE_DIR}/policy/frameworks
 
 broGenPolicies=${CMAKE_BINARY_DIR}/src
 
-broctlPolicies=${PROJECT_SOURCE_DIR}/aux/broctl/policy:${CMAKE_BINARY_DIR}/aux/broctl/policy/local
-
 installedPolicies=${POLICYDIR}:${POLICYDIR}/frameworks:${POLICYDIR}/protocols:${POLICYDIR}/detectors:${POLICYDIR}/time-machine:${POLICYDIR}/site
 
-echo .:$broPolicies:$broGenPolicies:$broctlPolicies
+echo .:$broPolicies:$broGenPolicies
diff --git a/policy/frameworks/cluster/base/node/manager.bro b/policy/frameworks/cluster/base/node/manager.bro
index bfe4a8bd44..2f416c2432 100644
--- a/policy/frameworks/cluster/base/node/manager.bro
+++ b/policy/frameworks/cluster/base/node/manager.bro
@@ -9,13 +9,6 @@
 ##! This is where the cluster manager sets it's specific settings for other
 ##! frameworks and in the core.
 
-## Set the mail script to be the default script for the cluster deployment.
-redef Notice::mail_script = "mail-alarm";
-
-## Set the template value that the mail script will use to send email.  The
-## default mail-alarm script will replace the value.
-redef Notice::mail_dest = "_broctl_default_";
-
 ## Set the port that the manager is supposed to listen on.
 redef Communication::listen_port_clear = Cluster::nodes[Cluster::node]$p;