summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--server.c2
-rw-r--r--state.c14
2 files changed, 15 insertions, 1 deletions
diff --git a/server.c b/server.c
index a304db0..5d985cb 100644
--- a/server.c
+++ b/server.c
@@ -159,7 +159,7 @@ void serverLogin(
 
 void serverAuth(void) {
 	assert(authPlain);
-	serverFormat("AUTHENTICATE %s\r\nCAP END\r\n", authPlain);
+	serverFormat("AUTHENTICATE %s\r\n", authPlain);
 	free(authPlain);
 	authPlain = NULL;
 }
diff --git a/state.c b/state.c
index 01829a4..c63a6b2 100644
--- a/state.c
+++ b/state.c
@@ -130,6 +130,16 @@ static void handleAuthenticate(struct Message *msg) {
 	serverAuth();
 }
 
+static void handleReplyLoggedIn(struct Message *msg) {
+	(void)msg;
+	serverFormat("CAP END\r\n");
+}
+
+static void handleErrorSASLFail(struct Message *msg) {
+	if (!msg->params[1]) errx(EX_PROTOCOL, "RPL_SASLFAIL without message");
+	errx(EX_CONFIG, "%s", msg->params[1]);
+}
+
 static void handleReplyWelcome(struct Message *msg) {
 	if (!msg->params[1]) errx(EX_PROTOCOL, "RPL_WELCOME without message");
 	set(&intro.origin, msg->origin);
@@ -233,6 +243,10 @@ static const struct {
 	{ "005", handleReplyISupport },
 	{ "332", handleReplyTopic },
 	{ "433", handleErrorNicknameInUse },
+	{ "900", handleReplyLoggedIn },
+	{ "904", handleErrorSASLFail },
+	{ "905", handleErrorSASLFail },
+	{ "906", handleErrorSASLFail },
 	{ "AUTHENTICATE", handleAuthenticate },
 	{ "CAP", handleCap },
 	{ "ERROR", handleError },
d449d6d5bc4e5cfc68&follow=1'>Add messy sh lexerJune McEnroe Surprisingly seems to work for everything I looked at in my repos. 2021-01-20Add all target to git.causal.agency MakefileJune McEnroe 2021-01-20Remove Lua supportJune McEnroe Lua support is unused and the dlsym fwrite/write hacks horrify me. Clean it up. 2021-01-20Fix tests for diff spansJune McEnroe 2021-01-20Avoid matching ':' in make tagsJune McEnroe Otherwise a :: rule includes one of the ':'s in the tag name. 2021-01-19Prefer tag matches not preceded by [[:alnum:]]June McEnroe Otherwise the "id" in "void" matches for "void id". 2021-01-19Escape \ and / in mtags search patternsJune McEnroe 2021-01-20Use mtags in source-filterJune McEnroe 2021-01-19Add mtags to generate tags for make and mdocJune McEnroe 2021-01-19Map tags to IDs using only [[:alnum:]-._]June McEnroe 2021-01-19Don't use a pager if reading standard inputJune McEnroe 2021-01-19Support BSD make syntax and match *.amJune McEnroe These don't really go together, but... 2021-01-19Match tab following escaped newline in make assignmentsJune McEnroe Otherwise it ends up going into Shell state. 2021-01-18Allow matching lexers using first input lineJune McEnroe