X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/0f021a8c1d618a1ca0997bb1b76bf255ba0a653f..b2c208be091670e3c5259eba77187bae6ac6eece:/modules/m_sasl.c

diff --git a/modules/m_sasl.c b/modules/m_sasl.c
index 451cb446..8dbbf0e7 100644
--- a/modules/m_sasl.c
+++ b/modules/m_sasl.c
@@ -106,8 +106,15 @@ mr_authenticate(struct Client *client_p, struct Client *source_p,
 		agent_p = find_id(source_p->preClient->sasl_agent);
 
 	if(agent_p == NULL)
-		sendto_server(NULL, NULL, CAP_TS6|CAP_ENCAP, NOCAPS, ":%s ENCAP * SASL %s * S %s", me.id,
-				source_p->id, parv[1]);
+	{
+		if (!strcmp(parv[1], "EXTERNAL") && source_p->certfp != NULL)
+			sendto_server(NULL, NULL, CAP_TS6|CAP_ENCAP, NOCAPS, ":%s ENCAP * SASL %s * S %s %s", me.id,
+					source_p->id, parv[1],
+					source_p->certfp);
+		else
+			sendto_server(NULL, NULL, CAP_TS6|CAP_ENCAP, NOCAPS, ":%s ENCAP * SASL %s * S %s", me.id,
+					source_p->id, parv[1]);
+	}
 	else
 		sendto_one(agent_p, ":%s ENCAP %s SASL %s %s C %s", me.id, agent_p->servptr->name,
 				source_p->id, agent_p->id, parv[1]);
@@ -150,7 +157,7 @@ me_sasl(struct Client *client_p, struct Client *source_p,
 	if(*target_p->preClient->sasl_agent && strncmp(parv[1], target_p->preClient->sasl_agent, IDLEN))
 		return 0;
 	else if(!*target_p->preClient->sasl_agent)
-		strlcpy(target_p->preClient->sasl_agent, parv[1], IDLEN);
+		rb_strlcpy(target_p->preClient->sasl_agent, parv[1], IDLEN);
 
 	if(*parv[3] == 'C')
 		sendto_one(target_p, "AUTHENTICATE %s", parv[4]);
@@ -161,7 +168,7 @@ me_sasl(struct Client *client_p, struct Client *source_p,
 		else if(*parv[4] == 'S') {
 			sendto_one(target_p, form_str(RPL_SASLSUCCESS), me.name, EmptyString(target_p->name) ? "*" : target_p->name);
 			target_p->preClient->sasl_complete = 1;
-			ServerStats->is_ssuc++;
+			ServerStats.is_ssuc++;
 		}
 		*target_p->preClient->sasl_agent = '\0'; /* Blank the stored agent so someone else can answer */
 	}
@@ -179,7 +186,7 @@ abort_sasl(struct Client *data)
 		return;
 
 	data->preClient->sasl_out = data->preClient->sasl_complete = 0;
-	ServerStats->is_sbad++;
+	ServerStats.is_sbad++;
 
 	if(!IsClosing(data))
 		sendto_one(data, form_str(ERR_SASLABORTED), me.name, EmptyString(data->name) ? "*" : data->name);