diff options
| author |  Fabio Bas | 2010-02-13 11:21:16 +0000 |
|---|---|---|
| committer | Fabio Bas | 2010-02-13 11:21:16 +0000 |
| commit | 87bfbefebab8bf25cfcbfd0b4935d8e6822f4508 (patch) | |
| tree | a6cf3552c0a626845cc81a3a4f842438dbef83fb /src/kvilib/irc/kvi_ircserverdb.cpp | |
| parent | Try to check server extended capabilities using CAP LS and use STARTTLS if en... (diff) | |
| download | KVIrc-87bfbefebab8bf25cfcbfd0b4935d8e6822f4508.tar.gz KVIrc-87bfbefebab8bf25cfcbfd0b4935d8e6822f4508.tar.bz2 KVIrc-87bfbefebab8bf25cfcbfd0b4935d8e6822f4508.zip | |
server config: changed "supportsSTARTTLS" to "enabledSTARTTLS" and enabled by default; this option is now meaningful only as a way to force STARTTLS disabled on a server that supports it;
server config: added "enabledSASL", "SaslNick", "SaslPass" options
main config: added global "enable SASL" option
sparser: handle CAP LS, REQ, ACK, NAK, END
ircconnection: added SASL support (only PLAIN method is supported by now)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3958 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/kvilib/irc/kvi_ircserverdb.cpp')
| -rw-r--r-- | src/kvilib/irc/kvi_ircserverdb.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kvilib/irc/kvi_ircserverdb.cpp b/src/kvilib/irc/kvi_ircserverdb.cpp index e2f839f2f..8819fe854 100644 --- a/src/kvilib/irc/kvi_ircserverdb.cpp +++ b/src/kvilib/irc/kvi_ircserverdb.cpp @@ -201,7 +201,7 @@ bool KviServerDataBase::makeCurrentServer(KviServerDefinition * d, QString & szE { if(d->bIPv6 == srv->isIPv6()) { - if((d->bSSL == srv->useSSL()) || (d->bSTARTTLS == srv->supportsSTARTTLS())) + if(d->bSSL == srv->useSSL()) { if(d->bPortIsValid) { @@ -319,7 +319,7 @@ search_finished: s->m_szInitUMode = d->szInitUMode; s->setIPv6(d->bIPv6); s->setUseSSL(d->bSSL); - s->setSupportsSTARTTLS(d->bSTARTTLS); + s->setEnabledSTARTTLS(d->bSTARTTLS); r->insertServer(s); m_szCurrentNetwork = r->name(); r->setCurrentServer(s); |