Merge remote-tracking branch 'origin/topic/johanna/gh-446-rfb'

* origin/topic/johanna/gh-446-rfb:
  Deprecate rfb_event.

CHANGES

@@ -1,4 +1,8 @@
 
+2.6-565 | 2019-07-03 09:32:34 -0700
+
+  * GH-446: Deprecate rfb_event. (Johanna Amann, Corelight)
+
 2.6-563 | 2019-07-03 01:57:40 -0700
 
   * Fix CIF integration and add logging options to intel.log and added comments to code (sfinlon)

VERSION

@@ -1 +1 @@
-2.6-563
+2.6-565

doc

@@ -1 +1 @@
-Subproject commit d08f22cdf179f4dfd7a49076e384a794a0d51a57
+Subproject commit be223b7e2fe9e2cfcfe8df4d594a6255276c6317

scripts/base/protocols/rfb/main.zeek

@@ -106,11 +106,6 @@ function set_session(c: connection)
 		}
 	}
 
-event rfb_event(c: connection) &priority=5
-	{
-	set_session(c);
-	}
-
 event rfb_client_version(c: connection, major_version: string, minor_version: string) &priority=5
 	{
 	set_session(c);

src/analyzer/protocol/rfb/events.bif

@@ -1,7 +1,7 @@
 ## Generated for RFB event
 ##
 ## c: The connection record for the underlying transport-layer session/flow.
-event rfb_event%(c: connection%);
+event rfb_event%(c: connection%) &deprecated="Remove in v3.1: This event never served a real purpose and will be removed. Please use the other rfb events instead.";
 
 ## Generated for RFB event authentication mechanism selection
 ##
@@ -47,4 +47,4 @@ event rfb_server_version%(c: connection, major_version: string, minor_version: s
 ## width: width of the shared screen
 ##
 ## height: height of the shared screen
-event rfb_server_parameters%(c: connection, name: string, width: count, height: count%);
+event rfb_server_parameters%(c: connection, name: string, width: count, height: count%);

testing/external/commit-hash.zeek-testing

@@ -1 +1 @@
-3db517fc4e1cfb1f0050b65eee4fd1b61ba5a461
+84239d2fdd2f491f436f8597e8b6ca5fb93f7a5f