From d4ff0457718b573d2c9d20000c63014666bf5791 Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Sat, 9 Nov 2019 20:17:43 -0500
Subject: Maintain stateCaps and offer them to clients

---
 state.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'state.c')

diff --git a/state.c b/state.c
index da5c96f..e17d9e6 100644
--- a/state.c
+++ b/state.c
@@ -45,7 +45,7 @@ void stateLogin(
 ) {
 	if (pass) serverFormat("PASS :%s\r\n", pass);
 	if (sasl) {
-		serverFormat("CAP REQ :sasl\r\n");
+		serverFormat("CAP REQ :%s\r\n", capList(CapSASL));
 		if (plain) {
 			byte buf[1 + strlen(plain)];
 			buf[0] = 0;
@@ -59,14 +59,22 @@ void stateLogin(
 	}
 	serverFormat("NICK %s\r\n", nick);
 	serverFormat("USER %s 0 * :%s\r\n", user, real);
+	serverFormat("CAP LS\r\n");
 }
 
 static void handleCap(struct Message *msg) {
 	require(msg, false, 3);
-	if (strcmp(msg->params[1], "ACK") || strncmp(msg->params[2], "sasl", 4)) {
-		errx(EX_CONFIG, "server does not support SASL");
+	enum Cap caps = capParse(msg->params[2]);
+	if (!strcmp(msg->params[1], "ACK")) {
+		stateCaps |= caps;
+		if (caps & CapSASL) {
+			serverFormat(
+				"AUTHENTICATE %s\r\n", (plainBase64 ? "PLAIN" : "EXTERNAL")
+			);
+		}
+	} else if (!strcmp(msg->params[1], "NAK")) {
+		errx(EX_CONFIG, "server does not support %s", msg->params[2]);
 	}
-	serverFormat("AUTHENTICATE %s\r\n", (plainBase64 ? "PLAIN" : "EXTERNAL"));
 }
 
 static void handleAuthenticate(struct Message *msg) {
-- 
cgit 1.4.1