1 files changed, 5 insertions, 0 deletions
diff --git a/irc.c b/irc.c
index 563d3fca..d0685887 100644
--- a/irc.c
+++ b/irc.c
@@ -751,6 +751,11 @@ int irc_check_login(irc_t *irc)
 		if (global.conf->authmode == AUTHMODE_CLOSED && !(irc->status & USTATUS_AUTHORIZED)) {
 			irc_send_num(irc, 464, ":This server is password-protected.");
 			return 0;
+		} else if (global.conf->authmode == AUTHMODE_SASL &&
+		    (!(irc->caps & CAP_SASL) ||
+		     !(irc->status & USTATUS_SASL_AUTHENTICATED))) {
+			irc_send_num(irc, 464, ":This server requires sasl.");
+			return 0;
 		} else {
 			irc_channel_t *ic;
 			irc_user_t *iu = irc->user;