X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/08d11e34cc17e3045231729d87025a0cfa598f54..d7b7d8bbdf40036849709d9b520cdd909c9c7eb1:/modules/m_dline.c

diff --git a/modules/m_dline.c b/modules/m_dline.c
index 7aaa535..32cc408 100644
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "class.h"
 #include "client.h"
@@ -35,7 +34,6 @@
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
@@ -78,7 +76,7 @@ mo_dline(struct Client *client_p, struct Client *source_p,
 	const char *dlhost;
 	char *oper_reason;
 	char *reason = def;
-	struct irc_sockaddr_storage daddr;
+	struct rb_sockaddr_storage daddr;
 	char cidr_form_host[HOSTLEN + 1];
 	struct ConfItem *aconf;
 	int bits;
@@ -188,7 +186,7 @@ mo_dline(struct Client *client_p, struct Client *source_p,
 
 	aconf = make_conf();
 	aconf->status = CONF_DLINE;
-	DupString(aconf->host, dlhost);
+	aconf->host = rb_strdup(dlhost);
 
 	/* Look for an oper reason */
 	if((oper_reason = strchr(reason, '|')) != NULL)
@@ -197,16 +195,16 @@ mo_dline(struct Client *client_p, struct Client *source_p,
 		oper_reason++;
 
 		if(!EmptyString(oper_reason))
-			DupString(aconf->spasswd, oper_reason);
+			aconf->spasswd = rb_strdup(oper_reason);
 	}
 
 	if(tdline_time > 0)
 	{
-		ircsnprintf(dlbuffer, sizeof(dlbuffer), 
+		rb_snprintf(dlbuffer, sizeof(dlbuffer), 
 			 "Temporary D-line %d min. - %s (%s)",
 			 (int) (tdline_time / 60), reason, current_date);
-		DupString(aconf->passwd, dlbuffer);
-		aconf->hold = CurrentTime + tdline_time;
+		aconf->passwd = rb_strdup(dlbuffer);
+		aconf->hold = rb_current_time() + tdline_time;
 		add_temp_dline(aconf);
 
 		if(EmptyString(oper_reason))
@@ -235,8 +233,8 @@ mo_dline(struct Client *client_p, struct Client *source_p,
 	}
 	else
 	{
-		ircsnprintf(dlbuffer, sizeof(dlbuffer), "%s (%s)", reason, current_date);
-		DupString(aconf->passwd, dlbuffer);
+		rb_snprintf(dlbuffer, sizeof(dlbuffer), "%s (%s)", reason, current_date);
+		aconf->passwd = rb_strdup(dlbuffer);
 		add_conf_by_address(aconf->host, CONF_DLINE, NULL, aconf);
 		write_confitem(DLINE_TYPE, source_p, NULL, aconf->host, reason,
 			       oper_reason, current_date, 0);
@@ -262,7 +260,7 @@ mo_undline(struct Client *client_p, struct Client *source_p, int parc, const cha
 	int pairme = NO, error_on_write = NO;
 	mode_t oldumask;
 
-	ircsnprintf(temppath, sizeof(temppath), "%s.tmp", ConfigFileEntry.dlinefile);
+	rb_snprintf(temppath, sizeof(temppath), "%s.tmp", ConfigFileEntry.dlinefile);
 
 	if(!IsOperUnkline(source_p))
 	{
@@ -460,7 +458,7 @@ remove_temp_dline(struct ConfItem *aconf)
 		{
 			if (aconf == ptr->data)
 			{
-				dlinkDestroy(ptr, &temp_dlines[i]);
+				rb_dlinkDestroy(ptr, &temp_dlines[i]);
 				delete_one_address_conf(aconf->host, aconf);
 				return YES;
 			}