diff --git a/CHANGES b/CHANGES index ffbc3213a9..491048b92e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,9 @@ +2.4-282 | 2016-02-13 10:48:21 -0800 + + * Add missing break in in StartTLS case of IRC analyzer. Found by + Aaron Eppert. (Johanna Amann) + 2.4-280 | 2016-02-13 10:40:16 -0800 * Fix memory leaks in stats.cc and smb.cc. (Johanna Amann) diff --git a/VERSION b/VERSION index 28fb8abb16..7d55ca4ceb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4-280 +2.4-282 diff --git a/aux/plugins b/aux/plugins index a2f97d5760..d251af520c 160000 --- a/aux/plugins +++ b/aux/plugins @@ -1 +1 @@ -Subproject commit a2f97d5760324b30897b7008b74a8312b7643853 +Subproject commit d251af520ccdede694d7b3b7bcbc47df1080508c diff --git a/src/analyzer/protocol/irc/IRC.cc b/src/analyzer/protocol/irc/IRC.cc index 18426c0f7c..a26045f250 100644 --- a/src/analyzer/protocol/irc/IRC.cc +++ b/src/analyzer/protocol/irc/IRC.cc @@ -587,6 +587,7 @@ void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig) case 670: // StartTLS success reply to StartTLS StartTLS(); + break; // All other server replies. default: