Merge commit '1a327cd355' into topic/policy-scripts-new

* commit '1a327cd355':
  Moved events for filling in connection service field to dpd.bro

policy.old/conn.bro

@@ -310,25 +310,6 @@ function record_connection(f: file, c: connection)
 	print f, log_msg;
 	}
 
-event protocol_confirmation(c: connection, atype: count, aid: count)
-	{
-	if ( ! dpd_conn_logs )
-		return;
-
-	delete c$service[fmt("-%s",analyzer_name(atype))];
-	add c$service[analyzer_name(atype)];
-	}
-
-event protocol_violation(c: connection, atype: count, aid: count,
-				reason: string) &priority = 10
-	{
-	if ( ! dpd_conn_logs )
-		return;
-
-	delete c$service[analyzer_name(atype)];
-	add c$service[fmt("-%s",analyzer_name(atype))];
-	}
-
 event connection_established(c: connection)
 	{
 	Hot::check_hot(c, Hot::CONN_ESTABLISHED);

policy.old/dpd.bro

@@ -1,5 +0,0 @@
-# $Id: dpd.bro,v 1.1.2.1 2006/05/10 02:10:26 sommer Exp $
-#
-# Activates port-independent protocol detection.
-
-redef signature_files += "dpd.sig";

policy/dpd.bro

@@ -0,0 +1,20 @@
+# $Id: dpd.bro,v 1.1.2.1 2006/05/10 02:10:26 sommer Exp $
+#
+# Activates port-independent protocol detection.
+
+redef signature_files += "dpd.sig";
+
+
+event protocol_confirmation(c: connection, atype: count, aid: count)
+	{
+	delete c$service[fmt("-%s",analyzer_name(atype))];
+	add c$service[analyzer_name(atype)];
+	}
+
+event protocol_violation(c: connection, atype: count, aid: count,
+				reason: string) &priority = 10
+	{
+	delete c$service[analyzer_name(atype)];
+	add c$service[fmt("-%s",analyzer_name(atype))];
+	}
+