From 437162dca3dff21272328908054b37b19351a228 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 26 Oct 2019 22:15:47 -0400 Subject: Wait for AUTHENTICATE + from server --- server.c | 7 +------ state.c | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/server.c b/server.c index 3dec684..964b15b 100644 --- a/server.c +++ b/server.c @@ -159,12 +159,7 @@ void serverLogin( void serverAuth(void) { assert(authPlain); - serverFormat( - "AUTHENTICATE PLAIN\r\n" - "AUTHENTICATE %s\r\n" - "CAP END\r\n", - authPlain - ); + serverFormat("AUTHENTICATE %s\r\nCAP END\r\n", authPlain); free(authPlain); authPlain = NULL; } diff --git a/state.c b/state.c index fa9c77b..ee3ae78 100644 --- a/state.c +++ b/state.c @@ -122,6 +122,11 @@ static void handleCap(struct Message *msg) { bool ack = msg->params[1] && !strcmp(msg->params[1], "ACK"); bool sasl = msg->params[2] && !strncmp(msg->params[2], "sasl", 4); if (!ack || !sasl) errx(EX_CONFIG, "server does not support SASL"); + serverFormat("AUTHENTICATE PLAIN\r\n"); +} + +static void handleAuthenticate(struct Message *msg) { + (void)msg; serverAuth(); } @@ -221,6 +226,7 @@ static const struct { { "004", handleReplyMyInfo }, { "005", handleReplyISupport }, { "332", handleReplyTopic }, + { "AUTHENTICATE", handleAuthenticate }, { "CAP", handleCap }, { "ERROR", handleError }, { "JOIN", handleJoin }, -- cgit 1.4.1