aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-09-15 04:28:09 -04:00
Code

Merge pull request #594 from LemonBoy/sasl_fail_fix

Browse Source 
Make sure SASL was actually requested before failing.
This commit is contained in:
ailin-nemui 2017-01-02 14:39:01 +01:00 committed by GitHub
commit ae48e49350
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fe-common/irc/fe-sasl.c
View File

@ -1,7 +1,7 @@
/*
fe-sasl.c : irssi
Copyright (C) 2015 The Lemon Man
Copyright (C) 2015-2017 The Lemon Man
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -22,6 +22,8 @@
#include "module-formats.h"
#include "signals.h"
#include "levels.h"
#include "misc.h"
#include "sasl.h"
#include "irc-servers.h"
#include "settings.h"
@ -43,6 +45,7 @@ static void sig_cap_end(IRC_SERVER_REC *server)
/* The negotiation has now been terminated, if we didn't manage to
* authenticate successfully with the server just disconnect. */
if (!server->sasl_success &&
server->connrec->sasl_mechanism != SASL_MECHANISM_NONE &&
settings_get_bool("sasl_disconnect_on_failure")) {
/* We can't use server_disconnect() here because we'd end up
* freeing the 'server' object and be guilty of a slew of UaF. */