Fix a few issues

- Rehash notices
- Modes in CAPAB
- GetTargetAndAction() not being static in m_callerid
- Loading custom configuration files using --config. (@SaberUK)
- ServerConfig::Read not using std::endl. (@SaberUK)
- Out of date comments in opers.conf.example, issue #624

2 files changed, 2 insertions, 2 deletions

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);
 		}
 	}