X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/b8be4a3f4cc6f82d13e62079813fef37eed24683..8e3b2b85c7221f2f9f1ca6d5e48880d521d2a1a3:/src/s_newconf.c

diff --git a/src/s_newconf.c b/src/s_newconf.c
index 93f5896..592b410 100644
--- a/src/s_newconf.c
+++ b/src/s_newconf.c
@@ -458,6 +458,24 @@ set_server_conf_autoconn(struct Client *source_p, const char *name, int newval)
 		sendto_one_notice(source_p, ":Can't find %s", name);
 }
 
+void
+disable_server_conf_autoconn(const char *name)
+{
+	struct server_conf *server_p;
+
+	server_p = find_server_conf(name);
+	if(server_p != NULL && server_p->flags & SERVER_AUTOCONN)
+	{
+		server_p->flags &= ~SERVER_AUTOCONN;
+
+		sendto_realops_snomask(SNO_GENERAL, L_ALL,
+				"Disabling AUTOCONN for %s because of error",
+				name);
+		ilog(L_SERVER, "Disabling AUTOCONN for %s because of error",
+				name);
+	}
+}
+
 struct ConfItem *
 find_xline(const char *gecos, int counter)
 {
@@ -468,7 +486,7 @@ find_xline(const char *gecos, int counter)
 	{
 		aconf = ptr->data;
 
-		if(match_esc(aconf->name, gecos))
+		if(match_esc(aconf->host, gecos))
 		{
 			if(counter)
 				aconf->port++;
@@ -489,7 +507,7 @@ find_xline_mask(const char *gecos)
 	{
 		aconf = ptr->data;
 
-		if(!irccmp(aconf->name, gecos))
+		if(!irccmp(aconf->host, gecos))
 			return aconf;
 	}
 
@@ -506,7 +524,7 @@ find_nick_resv(const char *name)
 	{
 		aconf = ptr->data;
 
-		if(match_esc(aconf->name, name))
+		if(match_esc(aconf->host, name))
 		{
 			aconf->port++;
 			return aconf;
@@ -526,7 +544,7 @@ find_nick_resv_mask(const char *name)
 	{
 		aconf = ptr->data;
 
-		if(!irccmp(aconf->name, name))
+		if(!irccmp(aconf->host, name))
 			return aconf;
 	}
 
@@ -650,7 +668,7 @@ expire_temp_rxlines(void *unused)
 			if(ConfigFileEntry.tkline_expire_notices)
 				sendto_realops_snomask(SNO_GENERAL, L_ALL,
 						"Temporary RESV for [%s] expired",
-						aconf->name);
+						aconf->host);
 
 			free_conf(aconf);
 			rb_dlinkDestroy(ptr, &resvTable[i]);
@@ -667,7 +685,7 @@ expire_temp_rxlines(void *unused)
 			if(ConfigFileEntry.tkline_expire_notices)
 				sendto_realops_snomask(SNO_GENERAL, L_ALL,
 						"Temporary RESV for [%s] expired",
-						aconf->name);
+						aconf->host);
 			free_conf(aconf);
 			rb_dlinkDestroy(ptr, &resv_conf_list);
 		}
@@ -682,7 +700,7 @@ expire_temp_rxlines(void *unused)
 			if(ConfigFileEntry.tkline_expire_notices)
 				sendto_realops_snomask(SNO_GENERAL, L_ALL,
 						"Temporary X-line for [%s] expired",
-						aconf->name);
+						aconf->host);
 			free_conf(aconf);
 			rb_dlinkDestroy(ptr, &xline_conf_list);
 		}