added ssl cipher notice on connect

[ircu2.10.12-pk.git] / ircd / m_error.c

diff --git a/ircd/m_error.c b/ircd/m_error.c
index 5249a5fceea353cfc664decc58b5fc4fce108545..561fbcffffb44cfe5a673ecb1dda083f135dfbc3 100644 (file)
--- a/ircd/m_error.c
+++ b/ircd/m_error.c
@@ -85,6 +85,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_alloc.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "numeric.h"
@@ -93,7 +94,7 @@
 #include "s_misc.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /*
@@ -106,7 +107,7 @@ int mr_error(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
   const char *para;
 
-  if (IsUserPort(cptr))
+  if (!IsHandshake(cptr) && !IsConnecting(cptr))
     return 0; /* ignore ERROR from regular clients */
 
   para = (parc > 1 && *parv[parc - 1] != '\0') ? parv[parc - 1] : "<>";