X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/8a78afe43d8c11af9e1d50ef438f0f193dcd12b3..9879cd59a64a7801510d3573209fc4949ee62766:/src/s_conf.c

diff --git a/src/s_conf.c b/src/s_conf.c
index f903330..856a4e2 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -44,7 +44,6 @@
 #include "numeric.h"
 #include "logger.h"
 #include "send.h"
-#include "s_gline.h"
 #include "reject.h"
 #include "cache.h"
 #include "blacklist.h"
@@ -259,7 +258,7 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 			/* why ipaddr, and not just source_p->sockhost? --fl */
 #if 0
 			static char ipaddr[HOSTIPLEN];
-			inetntop_sock(&source_p->localClient->ip, ipaddr, sizeof(ipaddr));
+			rb_inet_ntop_sock(&source_p->localClient->ip, ipaddr, sizeof(ipaddr));
 #endif
 			sendto_realops_snomask(SNO_UNAUTH, L_ALL,
 					"Unauthorised client connection from "
@@ -314,8 +313,8 @@ verify_access(struct Client *client_p, const char *username)
 	}
 	else
 	{
-		strlcpy(non_ident, "~", sizeof(non_ident));
-		strlcat(non_ident, username, sizeof(non_ident));
+		rb_strlcpy(non_ident, "~", sizeof(non_ident));
+		rb_strlcat(non_ident, username, sizeof(non_ident));
 		aconf = find_address_conf(client_p->host, client_p->sockhost,
 					non_ident, client_p->username,
 					(struct sockaddr *) &client_p->localClient->ip,
@@ -357,14 +356,14 @@ verify_access(struct Client *client_p, const char *username)
 				char *host = p+1;
 				*p = '\0';
 
-				strlcpy(client_p->username, aconf->name,
+				rb_strlcpy(client_p->username, aconf->name,
 					sizeof(client_p->username));
-				strlcpy(client_p->host, host,
+				rb_strlcpy(client_p->host, host,
 					sizeof(client_p->host));
 				*p = '@';
 			}
 			else
-				strlcpy(client_p->host, aconf->name, sizeof(client_p->host));
+				rb_strlcpy(client_p->host, aconf->name, sizeof(client_p->host));
 		}
 		return (attach_iline(client_p, aconf));
 	}
@@ -379,18 +378,6 @@ verify_access(struct Client *client_p, const char *username)
 		add_reject(client_p, aconf->user, aconf->host);
 		return (BANNED_CLIENT);
 	}
-	else if(aconf->status & CONF_GLINE)
-	{
-		sendto_one_notice(client_p, ":*** G-lined");
-
-		if(ConfigFileEntry.kline_with_reason)
-			sendto_one(client_p,
-					form_str(ERR_YOUREBANNEDCREEP),
-					me.name, client_p->name, aconf->passwd);
-
-		add_reject(client_p, aconf->user, aconf->host);
-		return (BANNED_CLIENT);
-	}
 
 	return NOT_AUTHORISED;
 }
@@ -629,9 +616,9 @@ rehash(int sig)
 	read_conf_files(NO);
 
 	if(ServerInfo.description != NULL)
-		strlcpy(me.info, ServerInfo.description, sizeof(me.info));
+		rb_strlcpy(me.info, ServerInfo.description, sizeof(me.info));
 	else
-		strlcpy(me.info, "unknown", sizeof(me.info));
+		rb_strlcpy(me.info, "unknown", sizeof(me.info));
 
 	open_logfiles();
 	return (0);
@@ -776,15 +763,10 @@ set_default_conf(void)
 	ConfigFileEntry.fname_operlog = NULL;
 	ConfigFileEntry.fname_foperlog = NULL;
 	ConfigFileEntry.fname_serverlog = NULL;
-	ConfigFileEntry.fname_glinelog = NULL;
 	ConfigFileEntry.fname_klinelog = NULL;
 	ConfigFileEntry.fname_operspylog = NULL;
 	ConfigFileEntry.fname_ioerrorlog = NULL;
-	ConfigFileEntry.glines = NO;
 	ConfigFileEntry.use_egd = NO;
-	ConfigFileEntry.gline_time = 12 * 3600;
-	ConfigFileEntry.gline_min_cidr = 16;
-	ConfigFileEntry.gline_min_cidr6 = 48;
 	ConfigFileEntry.hide_spoof_ips = YES;
 	ConfigFileEntry.hide_error_messages = 1;
 	ConfigFileEntry.dots_in_ident = 0;
@@ -883,24 +865,24 @@ validate_conf(void)
 	if(ServerInfo.network_desc == NULL)
 		ServerInfo.network_desc = rb_strdup(NETWORK_DESC_DEFAULT);
 
-	if(ServerInfo.ssld_count < 1)
+	if(ServerInfo.ssld_count < 1)
 		ServerInfo.ssld_count = 1;
 
-	if(!rb_setup_ssl_server(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params))
-	{
-		ilog(L_MAIN, "WARNING: Unable to setup SSL.");
-		ssl_ok = 0;
-	} else {
-		ssl_ok = 1;
-		send_new_ssl_certs(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params);
-	}
-
-	if(ServerInfo.ssld_count > get_ssld_count())
-	{
-		int start = ServerInfo.ssld_count - get_ssld_count();
-		/* start up additional ssld if needed */
-		start_ssldaemon(start, ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params);
-				
+	if(!rb_setup_ssl_server(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params))
+	{
+		ilog(L_MAIN, "WARNING: Unable to setup SSL.");
+		ssl_ok = 0;
+	} else {
+		ssl_ok = 1;
+		send_new_ssl_certs(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params);
+	}
+
+	if(ServerInfo.ssld_count > get_ssld_count())
+	{
+		int start = ServerInfo.ssld_count - get_ssld_count();
+		/* start up additional ssld if needed */
+		start_ssldaemon(start, ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params);
+				
 	}
 
 	if((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
@@ -1180,7 +1162,7 @@ read_conf_files(int cold)
 
 	   - Gozem 2002-07-21 
 	 */
-	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
+	rb_strlcpy(conffilebuf, filename, sizeof(conffilebuf));
 
 	if((conf_fbfile_in = fopen(filename, "r")) == NULL)
 	{