X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/8db00894ab7750513d8750290e508b5802bc1fc5..8e425f4137f87d4b537d60df4206b221889d2121:/modules/m_connect.c

diff --git a/modules/m_connect.c b/modules/m_connect.c
index bd2b438..809783a 100644
--- a/modules/m_connect.c
+++ b/modules/m_connect.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
@@ -38,6 +38,7 @@
 #include "parse.h"
 #include "hash.h"
 #include "modules.h"
+#include "sslproc.h"
 
 static int mo_connect(struct Client *, struct Client *, int, const char **);
 static int ms_connect(struct Client *, struct Client *, int, const char **);
@@ -97,12 +98,12 @@ mo_connect(struct Client *client_p, struct Client *source_p, int parc, const cha
 		return 0;
 	}
 
-	if(ServerConfSSL(server_p) && (!ssl_ok || !get_ssld_count()))
-	{
-		sendto_one_notice(source_p,
-				  ":Connect: Server %s is set to use SSL/TLS but SSL/TLS is not configured.",
-				  parv[1]);
-		return 0;
+	if(ServerConfSSL(server_p) && (!ssl_ok || !get_ssld_count()))
+	{
+		sendto_one_notice(source_p,
+				  ":Connect: Server %s is set to use SSL/TLS but SSL/TLS is not configured.",
+				  parv[1]);
+		return 0;
 	}
 
 	/*
@@ -128,7 +129,7 @@ mo_connect(struct Client *client_p, struct Client *source_p, int parc, const cha
 	 * Notify all operators about remote connect requests
 	 */
 
-	ilog(L_SERVER, "CONNECT From %s : %s %s", parv[0], parv[1], parc > 2 ? parv[2] : "");
+	ilog(L_SERVER, "CONNECT From %s : %s %s", source_p->name, parv[1], parc > 2 ? parv[2] : "");
 
 	server_p->port = port;
 	/*
@@ -137,14 +138,8 @@ mo_connect(struct Client *client_p, struct Client *source_p, int parc, const cha
 	 */
 	if(serv_connect(server_p, source_p))
 	{
-#ifndef HIDE_SERVERS_IPS
-			sendto_one_notice(source_p, ":*** Connecting to %s[%s].%d",
-				server_p->host, server_p->name, server_p->port);
-#else
 			sendto_one_notice(source_p, ":*** Connecting to %s.%d",
 				server_p->name, server_p->port);
-#endif
-
 	}
 	else
 	{
@@ -199,12 +194,12 @@ ms_connect(struct Client *client_p, struct Client *source_p, int parc, const cha
 		return 0;
 	}
 
-	if(ServerConfSSL(server_p) && (!ssl_ok || !get_ssld_count()))
-	{
-		sendto_one_notice(source_p,
-				  ":Connect: Server %s is set to use SSL/TLS but SSL/TLS is not configured.",
-				  parv[1]);
-		return 0;
+	if(ServerConfSSL(server_p) && (!ssl_ok || !get_ssld_count()))
+	{
+		sendto_one_notice(source_p,
+				  ":Connect: Server %s is set to use SSL/TLS but SSL/TLS is not configured.",
+				  parv[1]);
+		return 0;
 	}
 
 	/*
@@ -234,9 +229,6 @@ ms_connect(struct Client *client_p, struct Client *source_p, int parc, const cha
 	sendto_server(NULL, NULL, CAP_TS6, NOCAPS,
 		      ":%s WALLOPS :Remote CONNECT %s %d from %s",
 		      me.id, parv[1], port, source_p->name);
-	sendto_server(NULL, NULL, NOCAPS, CAP_TS6,
-		      ":%s WALLOPS :Remote CONNECT %s %d from %s",
-		      me.name, parv[1], port, source_p->name);
 
 	ilog(L_SERVER, "CONNECT From %s : %s %d", source_p->name, parv[1], port);