1
0
mirror of https://github.com/anope/anope.git synced 2026-06-27 05:46:37 +02:00

Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9

This commit is contained in:
lethality
2010-08-02 15:13:37 +01:00
3 changed files with 8 additions and 4 deletions
+2 -2
View File
@@ -305,9 +305,9 @@ options
* - m_socketengine_select
* - m_socketengine_epoll
*
* We recommend using epoll if your operating system supports it.
* We recommend using epoll if your operating system supports it (Linux 2.6+).
*/
socketengine = "m_socketengine_epoll"
socketengine = "m_socketengine_select"
/*
* The maximum length of passwords
+1 -1
View File
@@ -249,7 +249,7 @@ void chanserv(User *u, const Anope::string &buf)
{
Anope::string command = buf;
command.erase(command.begin());
command.erase(command.end());
command.erase(command.end() - 1);
ircdproto->SendCTCP(ChanServ, u->nick, "%s", command.c_str());
}
else
+5 -1
View File
@@ -355,7 +355,11 @@ int init_primary(int ac, char **av)
ModuleManager::LoadModuleList(Config.DBModuleList);
/* Load the socket engine */
ModuleManager::LoadModule(Config.SocketEngine, NULL);
if (ModuleManager::LoadModule(Config.SocketEngine, NULL))
{
Alog(LOG_TERMINAL) << "Unable to load socket engine " << Config.SocketEngine;
return -1;
}
return 0;
}