mirror of
https://github.com/znc/znc.git
synced 2026-05-03 03:52:33 +02:00
Merged rev 838,888,890,894,899,900,902-904,926,934,963,984-989 from crox's branch:
- Changes to specfile - define PATH_MAX and RTLD_LOCAL if not defines - compile fixes - SetFileName should not set m_iFD - check for cygwin and do not use -fPIC - replaced if ... elif with case in configure.in - handle 437 reply code - allow disabled channels - use strerror() in CIRCSock::SockError() - added GetUser() to CClient and CIRCSock - added support for traffic accounting - added names to timers git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@806 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
@@ -36,5 +36,5 @@ bool CServer::IsSSL() const { return m_bSSL; }
|
||||
bool CServer::IsIPV6() const { return m_bIPV6; }
|
||||
|
||||
CString CServer::GetString() const {
|
||||
return m_sName + " " + CString(m_bSSL ? "+" : "") + CString(m_uPort) + CString(m_sPass.empty() ? CString("") : " " + m_sPass);
|
||||
return m_sName + " " + CString(m_bSSL ? "+" : "") + CString(m_uPort) + CString(m_sPass.empty() ? "" : " " + m_sPass);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user