Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Add a missing "break" in OSFinger.cc
  Fix buffer sizes in the rotate_file function

CHANGES

@@ -1,4 +1,10 @@
 
+2.6-beta2-6 | 2018-09-20 13:15:15 -0500
+
+  * Add a missing "break" in OSFinger.cc (Daniel Thayer)
+
+  * Fix buffer sizes in the rotate_file function (Daniel Thayer)
+
 2.6-beta2-3 | 2018-09-19 15:21:00 -0500
 
   * Add HTTP::sqli_policy hook to ignore counting a request as a SQL injection

VERSION

@@ -1 +1 @@
-2.6-beta2-3
+2.6-beta2-6

src/OSFinger.cc

@@ -469,6 +469,7 @@ reparse_ptr:
 	{
         case 'E':
           Error("OS fingerprinting: Quirk 'E' is obsolete. Remove it, append E to the options. Line",(uint32)ln);
+          break;
 
         case 'K':
 	  if ( mode != RST_FINGERPRINT_MODE )

src/util.cc

@@ -1272,7 +1272,7 @@ FILE* rotate_file(const char* name, RecordVal* rotate_info)
 	// Build file names.
 	const int buflen = strlen(name) + 128;
 
-	char tmpname[buflen], newname[buflen+4];
+	char newname[buflen], tmpname[buflen+4];
 
 	safe_snprintf(newname, buflen, "%s.%d.%.06f.tmp",
 			name, getpid(), network_time);