X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/17d00839b3821b7b41212b3ed2b3da2711f24618..70c6c150f6f669425d7929e3e5229f3b12368d75:/src/client.c

diff --git a/src/client.c b/src/client.c
index 458247b..72ce398 100644
--- a/src/client.c
+++ b/src/client.c
@@ -235,8 +235,14 @@ free_local_client(struct Client *client_p)
 	rb_free(client_p->localClient->fullcaps);
 	rb_free(client_p->localClient->opername);
 	rb_free(client_p->localClient->mangledhost);
+	if (client_p->localClient->privset)
+		privilegeset_unref(client_p->localClient->privset);
 
-	ssld_decrement_clicount(client_p->localClient->ssl_ctl);
+	if(IsSSL(client_p))
+	    ssld_decrement_clicount(client_p->localClient->ssl_ctl);
+	    
+	if(IsCapable(client_p, CAP_ZIP))
+	    ssld_decrement_clicount(client_p->localClient->z_ctl);
 
 	rb_bh_free(lclient_heap, client_p->localClient);
 	client_p->localClient = NULL;
@@ -441,84 +447,9 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban)
 void
 check_banned_lines(void)
 {
-	struct Client *client_p;	/* current local client_p being examined */
-	struct ConfItem *aconf = NULL;
-	rb_dlink_node *ptr, *next_ptr;
-
-	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
-	{
-		client_p = ptr->data;
-
-		if(IsMe(client_p))
-			continue;
-
-		/* if there is a returned struct ConfItem then kill it */
-		if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip, client_p->localClient->ip.ss_family)))
-		{
-			if(aconf->status & CONF_EXEMPTDLINE)
-				continue;
-
-			sendto_realops_snomask(SNO_GENERAL, L_ALL,
-					     "DLINE active for %s",
-					     get_client_name(client_p, HIDE_IP));
-
-			notify_banned_client(client_p, aconf, D_LINED);
-			continue;	/* and go examine next fd/client_p */
-		}
-
-		if(!IsPerson(client_p))
-			continue;
-
-		if((aconf = find_kline(client_p)) != NULL)
-		{
-			if(IsExemptKline(client_p))
-			{
-				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						"KLINE over-ruled for %s, client is kline_exempt [%s@%s]",
-						get_client_name(client_p, HIDE_IP),
-						aconf->user, aconf->host);
-				continue;
-			}
-
-			sendto_realops_snomask(SNO_GENERAL, L_ALL,
-					"KLINE active for %s",
-					get_client_name(client_p, HIDE_IP));
-			notify_banned_client(client_p, aconf, K_LINED);
-			continue;
-		}
-		else if((aconf = find_xline(client_p->info, 1)) != NULL)
-		{
-			if(IsExemptKline(client_p))
-			{
-				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						"XLINE over-ruled for %s, client is kline_exempt [%s]",
-						get_client_name(client_p, HIDE_IP),
-						aconf->name);
-				continue;
-			}
-
-			sendto_realops_snomask(SNO_GENERAL, L_ALL, "XLINE active for %s",
-					get_client_name(client_p, HIDE_IP));
-
-			(void) exit_client(client_p, client_p, &me, "Bad user info");
-			continue;
-		}
-	}
-
-	/* also check the unknowns list for new dlines */
-	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
-	{
-		client_p = ptr->data;
-
-		if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip,client_p->localClient->ip.ss_family)))
-		{
-			if(aconf->status & CONF_EXEMPTDLINE)
-				continue;
-
-			notify_banned_client(client_p, aconf, D_LINED);
-		}
-	}
-
+	check_dlines();
+	check_klines();
+	check_xlines();
 }
 
 /* check_klines_event()
@@ -560,8 +491,9 @@ check_klines(void)
 			if(IsExemptKline(client_p))
 			{
 				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						     "KLINE over-ruled for %s, client is kline_exempt",
-						     get_client_name(client_p, HIDE_IP));
+						     "KLINE over-ruled for %s, client is kline_exempt [%s@%s]",
+						     get_client_name(client_p, HIDE_IP),
+						     aconf->user, aconf->host);
 				continue;
 			}
 
@@ -651,8 +583,9 @@ check_xlines(void)
 			if(IsExemptKline(client_p))
 			{
 				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						     "XLINE over-ruled for %s, client is kline_exempt",
-						     get_client_name(client_p, HIDE_IP));
+						     "XLINE over-ruled for %s, client is kline_exempt [%s]",
+						     get_client_name(client_p, HIDE_IP),
+						     aconf->host);
 				continue;
 			}
 
@@ -1172,7 +1105,7 @@ exit_aborted_clients(void *unused)
  *
  */
 void
-dead_link(struct Client *client_p)
+dead_link(struct Client *client_p, int sendqex)
 {
 	struct abort_client *abt;
 
@@ -1182,7 +1115,7 @@ dead_link(struct Client *client_p)
 
 	abt = (struct abort_client *) rb_malloc(sizeof(struct abort_client));
 
-	if(client_p->flags & FLAGS_SENDQEX)
+	if(sendqex)
 		rb_strlcpy(abt->notice, "Max SendQ exceeded", sizeof(abt->notice));
 	else
 		rb_snprintf(abt->notice, sizeof(abt->notice), "Write error: %s", strerror(errno));