X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/4f14b4b7bc07ffb659b8e1cca26e27d6ee0bfad5..9879cd59a64a7801510d3573209fc4949ee62766:/src/s_newconf.c

diff --git a/src/s_newconf.c b/src/s_newconf.c
index 222a32e..6da826c 100644
--- a/src/s_newconf.c
+++ b/src/s_newconf.c
@@ -284,7 +284,7 @@ struct oper_conf *
 find_oper_conf(const char *username, const char *host, const char *locip, const char *name)
 {
 	struct oper_conf *oper_p;
-	struct irc_sockaddr_storage ip, cip;
+	struct rb_sockaddr_storage ip, cip;
 	char addr[HOSTLEN+1];
 	int bits, cbits;
 	rb_dlink_node *ptr;
@@ -299,7 +299,7 @@ find_oper_conf(const char *username, const char *host, const char *locip, const
 		if(irccmp(oper_p->name, name) || !match(oper_p->username, username))
 			continue;
 
-		strlcpy(addr, oper_p->host, sizeof(addr));
+		rb_strlcpy(addr, oper_p->host, sizeof(addr));
 
 		if(parse_netmask(addr, (struct sockaddr *)&ip, &bits) != HM_HOST)
 		{
@@ -327,7 +327,6 @@ struct oper_flags
 };
 static struct oper_flags oper_flagtable[] =
 {
-	{ OPER_GLINE,		'G', 'g' },
 	{ OPER_KLINE,		'K', 'k' },
 	{ OPER_XLINE,		'X', 'x' },
 	{ OPER_RESV,		'Q', 'q' },
@@ -756,7 +755,7 @@ add_nd_entry(const char *name)
 
 	nd = rb_bh_alloc(nd_heap);
 	
-	strlcpy(nd->name, name, sizeof(nd->name));
+	rb_strlcpy(nd->name, name, sizeof(nd->name));
 	nd->expire = rb_current_time() + ConfigFileEntry.nick_delay;
 
 	/* this list is ordered */