X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/1c4f9748d7f78800c2f1e3b645f514126fd5d707..6485005214c12ef94a50096e96478804b9cef556:/ircd/s_newconf.c

diff --git a/ircd/s_newconf.c b/ircd/s_newconf.c
index c593635a..8fc86af5 100644
--- a/ircd/s_newconf.c
+++ b/ircd/s_newconf.c
@@ -46,10 +46,8 @@
 #include "logger.h"
 #include "dns.h"
 
-rb_dlink_list shared_conf_list;
 rb_dlink_list cluster_conf_list;
 rb_dlink_list oper_conf_list;
-rb_dlink_list hubleaf_conf_list;
 rb_dlink_list server_conf_list;
 rb_dlink_list xline_conf_list;
 rb_dlink_list resv_conf_list;	/* nicks only! */
@@ -82,25 +80,12 @@ clear_s_newconf(void)
 	rb_dlink_node *ptr;
 	rb_dlink_node *next_ptr;
 
-	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, shared_conf_list.head)
-	{
-		/* ptr here is ptr->data->node */
-		rb_dlinkDelete(ptr, &shared_conf_list);
-		free_remote_conf(ptr->data);
-	}
-
 	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, cluster_conf_list.head)
 	{
 		rb_dlinkDelete(ptr, &cluster_conf_list);
 		free_remote_conf(ptr->data);
 	}
 
-	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, hubleaf_conf_list.head)
-	{
-		rb_dlinkDelete(ptr, &hubleaf_conf_list);
-		free_remote_conf(ptr->data);
-	}
-
 	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, oper_conf_list.head)
 	{
 		free_oper_conf(ptr->data);
@@ -173,31 +158,6 @@ free_remote_conf(struct remote_conf *remote_p)
 	rb_free(remote_p);
 }
 
-bool
-find_shared_conf(const char *username, const char *host,
-		const char *server, int flags)
-{
-	struct remote_conf *shared_p;
-	rb_dlink_node *ptr;
-
-	RB_DLINK_FOREACH(ptr, shared_conf_list.head)
-	{
-		shared_p = ptr->data;
-
-		if(match(shared_p->username, username) &&
-		   match(shared_p->host, host) &&
-		   match(shared_p->server, server))
-		{
-			if(shared_p->flags & flags)
-				return true;
-			else
-				return false;
-		}
-	}
-
-	return false;
-}
-
 void
 propagate_generic(struct Client *source_p, const char *command,
 		const char *target, int cap, const char *format, ...)
@@ -331,13 +291,11 @@ make_server_conf(void)
 	SET_SS_FAMILY(&server_p->bind4, AF_UNSPEC);
 	SET_SS_LEN(&server_p->bind4, sizeof(struct sockaddr_in));
 
-#ifdef RB_IPV6
 	SET_SS_FAMILY(&server_p->connect6, AF_UNSPEC);
 	SET_SS_LEN(&server_p->connect6, sizeof(struct sockaddr_in6));
 
 	SET_SS_FAMILY(&server_p->bind6, AF_UNSPEC);
 	SET_SS_LEN(&server_p->bind6, sizeof(struct sockaddr_in6));
-#endif
 
 	server_p->aftype = AF_UNSPEC;
 
@@ -389,19 +347,17 @@ conf_connect_dns_callback(const char *result, int status, int aftype, void *data
 	if(aftype == AF_INET)
 	{
 		if(status == 1)
-			rb_inet_pton_sock(result, (struct sockaddr *)&server_p->connect4);
+			rb_inet_pton_sock(result, &server_p->connect4);
 
 		server_p->dns_query_connect4 = 0;
 	}
-#ifdef RB_IPV6
 	else if(aftype == AF_INET6)
 	{
 		if(status == 1)
-			rb_inet_pton_sock(result, (struct sockaddr *)&server_p->connect6);
+			rb_inet_pton_sock(result, &server_p->connect6);
 
 		server_p->dns_query_connect6 = 0;
 	}
-#endif
 }
 
 /*
@@ -422,19 +378,17 @@ conf_bind_dns_callback(const char *result, int status, int aftype, void *data)
 	if(aftype == AF_INET)
 	{
 		if(status == 1)
-			rb_inet_pton_sock(result, (struct sockaddr *)&server_p->bind4);
+			rb_inet_pton_sock(result, &server_p->bind4);
 
 		server_p->dns_query_bind4 = 0;
 	}
-#ifdef RB_IPV6
 	else if(aftype == AF_INET6)
 	{
 		if(status == 1)
-			rb_inet_pton_sock(result, (struct sockaddr *)&server_p->bind6);
+			rb_inet_pton_sock(result, &server_p->bind6);
 
 		server_p->dns_query_bind6 = 0;
 	}
-#endif
 }
 
 void
@@ -462,20 +416,16 @@ add_server_conf(struct server_conf *server_p)
 	{
 		server_p->dns_query_connect4 =
 			lookup_hostname(server_p->connect_host, AF_INET, conf_connect_dns_callback, server_p);
-#ifdef RB_IPV6
 		server_p->dns_query_connect6 =
 			lookup_hostname(server_p->connect_host, AF_INET6, conf_connect_dns_callback, server_p);
-#endif
 	}
 
 	if(server_p->bind_host)
 	{
 		server_p->dns_query_bind4 =
 			lookup_hostname(server_p->bind_host, AF_INET, conf_bind_dns_callback, server_p);
-#ifdef RB_IPV6
 		server_p->dns_query_bind6 =
 			lookup_hostname(server_p->bind_host, AF_INET6, conf_bind_dns_callback, server_p);
-#endif
 	}
 }
 
@@ -553,7 +503,7 @@ set_server_conf_autoconn(struct Client *source_p, const char *name, int newval)
 		else
 			server_p->flags &= ~SERVER_AUTOCONN;
 
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
 				"%s has changed AUTOCONN for %s to %i",
 				get_oper_name(source_p), name, newval);
 	}
@@ -571,7 +521,7 @@ disable_server_conf_autoconn(const char *name)
 	{
 		server_p->flags &= ~SERVER_AUTOCONN;
 
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
 				"Disabling AUTOCONN for %s because of error",
 				name);
 		ilog(L_SERVER, "Disabling AUTOCONN for %s because of error",