X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/a52d84f7233346cbd24456a5b875785eb5369c53..303e85c59e4c04cb7100ebb4641c0ff214c40542:/ircd/s_user.c

diff --git a/ircd/s_user.c b/ircd/s_user.c
index 4ac4741e..bda9bca8 100644
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -81,7 +81,7 @@ int user_modes[256] = {
 	0,			/* O */
 	0,			/* P */
 	UMODE_NOFORWARD,	/* Q */
-	UMODE_REGONLYMSG,	/* R */
+	0,			/* R */
 	UMODE_SERVICE,		/* S */
 	0,			/* T */
 	0,			/* U */
@@ -97,7 +97,7 @@ int user_modes[256] = {
 	0,			/* d */
 	0,			/* e */
 	0,			/* f */
-	UMODE_CALLERID,		/* g */
+	0,			/* g */
 	0,			/* h */
 	UMODE_INVISIBLE,	/* i */
 	0,			/* j */
@@ -213,25 +213,25 @@ authd_check(struct Client *client_p, struct Client *source_p)
 
 	switch(source_p->preClient->auth.cause)
 	{
-	case 'B':	/* Blacklists */
+	case 'B':	/* DNSBL */
 		{
-			struct BlacklistStats *stats;
-			char *blacklist = source_p->preClient->auth.data;
+			struct DNSBLEntryStats *stats;
+			char *dnsbl_name = source_p->preClient->auth.data;
 
-			if(bl_stats != NULL)
-				if((stats = rb_dictionary_retrieve(bl_stats, blacklist)) != NULL)
+			if(dnsbl_stats != NULL)
+				if((stats = rb_dictionary_retrieve(dnsbl_stats, dnsbl_name)) != NULL)
 					stats->hits++;
 
 			if(IsExemptKline(source_p) || IsConfExemptDNSBL(aconf))
 			{
 				sendto_one_notice(source_p, ":*** Your IP address %s is listed in %s, but you are exempt",
-						source_p->sockhost, blacklist);
+						source_p->sockhost, dnsbl_name);
 				break;
 			}
 
 			sendto_realops_snomask(SNO_REJ, L_NETWIDE,
 				"Listed on DNSBL %s: %s (%s@%s) [%s] [%s]",
-				blacklist, source_p->name, source_p->username, source_p->host,
+				dnsbl_name, source_p->name, source_p->username, source_p->host,
 				IsIPSpoof(source_p) ? "255.255.255.255" : source_p->sockhost,
 				source_p->info);
 
@@ -239,9 +239,9 @@ authd_check(struct Client *client_p, struct Client *source_p)
 				me.name, source_p->name, reason);
 
 			sendto_one_notice(source_p, ":*** Your IP address %s is listed in %s",
-				source_p->sockhost, blacklist);
-			add_reject(source_p, NULL, NULL);
-			exit_client(client_p, source_p, &me, "Banned (DNS blacklist)");
+				source_p->sockhost, dnsbl_name);
+			add_reject(source_p, NULL, NULL, NULL, "Banned (listed in a DNSBL)");
+			exit_client(client_p, source_p, &me, "Banned (listed in a DNSBL)");
 			reject = true;
 		}
 		break;
@@ -283,7 +283,7 @@ authd_check(struct Client *client_p, struct Client *source_p)
 			sendto_one_notice(source_p,
 				":*** Your IP address %s has been detected as an open proxy (type %s, port %s)",
 				source_p->sockhost, proxy, port);
-			add_reject(source_p, NULL, NULL);
+			add_reject(source_p, NULL, NULL, NULL, "Banned (Open proxy)");
 			exit_client(client_p, source_p, &me, "Banned (Open proxy)");
 			reject = true;
 		}
@@ -307,7 +307,7 @@ authd_check(struct Client *client_p, struct Client *source_p)
 
 		sendto_one_notice(source_p, ":*** Rejected by authentication system: %s",
 			reason);
-		add_reject(source_p, NULL, NULL);
+		add_reject(source_p, NULL, NULL, NULL, "Banned (authentication system)");
 		exit_client(client_p, source_p, &me, "Banned (authentication system)");
 		reject = true;
 		break;
@@ -386,7 +386,9 @@ register_local_user(struct Client *client_p, struct Client *source_p)
 	if(source_p->preClient->auth.cid)
 		return -1;
 
-	client_p->localClient->last = rb_current_time();
+	/* Set firsttime here so that post_registration_delay works from registration,
+	 * rather than initial connection.  */
+	source_p->localClient->firsttime = client_p->localClient->last = rb_current_time();
 
 	/* XXX - fixme. we shouldnt have to build a users buffer twice.. */
 	if(!IsGotId(source_p) && (strchr(source_p->username, '[') != NULL))
@@ -553,7 +555,7 @@ register_local_user(struct Client *client_p, struct Client *source_p)
 	   (xconf = find_xline(source_p->info, 1)) != NULL)
 	{
 		ServerStats.is_ref++;
-		add_reject(source_p, xconf->host, NULL);
+		add_reject(source_p, xconf->host, NULL, NULL, NULL);
 		exit_client(client_p, source_p, &me, "Bad user info");
 		return CLIENT_EXITED;
 	}
@@ -925,7 +927,7 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
 	if(IsConfExemptDNSBL(aconf))
 		/* kline exempt implies this, don't send both */
 		if(!IsConfExemptKline(aconf))
-			sendto_one_notice(source_p, ":*** You are exempt from DNS blacklists");
+			sendto_one_notice(source_p, ":*** You are exempt from DNSBL listings");
 
 	/* If this user is exempt from user limits set it F lined" */
 	if(IsConfExemptLimits(aconf))