From 2a040b40a581fc76c3121fbb7e4910d3e4895383 Mon Sep 17 00:00:00 2001
From: Bram Matthys <syzop@vulnscan.org>
Date: Sat, 25 Nov 2017 16:01:56 +0100
Subject: [PATCH] Improve "non-SSL client on SSL port" detection.

---
 src/ssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ssl.c b/src/ssl.c
index 34375b928..cd9988f89 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -626,7 +626,7 @@ int ircd_SSL_accept(aClient *acptr, int fd) {
 			(void)send(fd, buf, strlen(buf), 0);
 			return fatal_ssl_error(SSL_ERROR_SSL, SAFE_SSL_ACCEPT, ERRNO, acptr);
 		}
-		if ((n >= 4) && (!strncmp(buf, "USER", 4) || !strncmp(buf, "NICK", 4) || !strncmp(buf, "PASS", 4)))
+		if ((n >= 4) && (!strncmp(buf, "USER", 4) || !strncmp(buf, "NICK", 4) || !strncmp(buf, "PASS", 4) || !strncmp(buf, "CAP ", 4)))
 		{
 			char buf[512];
 			snprintf(buf, sizeof(buf),