summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/conf/opers.conf.example2
-rw-r--r--src/commands/cmd_rehash.cpp2
-rw-r--r--src/configreader.cpp2
-rw-r--r--src/inspircd.cpp2
-rw-r--r--src/modules/m_callerid.cpp2
-rw-r--r--src/modules/m_spanningtree/capab.cpp2
6 files changed, 5 insertions, 7 deletions
diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf.example
index e7b65b675..b39c73e43 100644
--- a/docs/conf/opers.conf.example
+++ b/docs/conf/opers.conf.example
@@ -54,8 +54,6 @@
<type
# name: Name of type. Used in actual olines below.
- # Cannot contain spaces. If you would like a space, use
- # the _ character instead and it will translate to a space on whois.
name="NetAdmin"
# classes: classes (above blocks) that this type belongs to.
diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp
index a08ba1ba5..1fa726962 100644
--- a/src/commands/cmd_rehash.cpp
+++ b/src/commands/cmd_rehash.cpp
@@ -88,7 +88,7 @@ CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, Use
/* Don't do anything with the logs here -- logs are restarted
* after the config thread has completed.
*/
- ServerInstance->Rehash();
+ ServerInstance->Rehash(user->uuid);
}
else
{
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 0df69071b..7493d980c 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -521,7 +521,7 @@ void ServerConfig::Read()
catch (CoreException& err)
{
valid = false;
- errstr << err.GetReason();
+ errstr << err.GetReason() << std::endl;
}
}
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 8336a4847..368ca6e8b 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -335,7 +335,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
{
case 'c':
/* Config filename was set */
- ConfigFileName = optarg;
+ ConfigFileName = ServerInstance->Config->Paths.PrependConfig(optarg);
break;
case 0:
/* getopt_long_only() set an int variable, just keep going */
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 33c874946..1a2fd3a84 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -158,7 +158,7 @@ class CommandAccept : public Command
*/
typedef std::pair<User*, bool> ACCEPTAction;
- ACCEPTAction GetTargetAndAction(std::string& tok)
+ static ACCEPTAction GetTargetAndAction(std::string& tok)
{
bool remove = (tok[0] == '-');
if ((remove) || (tok[0] == '+'))
diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 7afcc50e5..52404aa1d 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -64,8 +64,8 @@ static std::string BuildModeList(ModeType type)
{
if (pm->GetPrefix())
mdesc.push_back(pm->GetPrefix());
- mdesc.push_back(mh->GetModeChar());
}
+ mdesc.push_back(mh->GetModeChar());
modes.push_back(mdesc);
}
}