Merge commit 'refs/pull/665/head' of github.com:znc/znc

This commit is contained in:
Alexey Sokolov
2014-10-26 12:17:31 +00:00
22 changed files with 67 additions and 217 deletions

View File

@@ -1771,7 +1771,7 @@ CZNC::TrafficStatsMap CZNC::GetTrafficStats(TrafficStatsPair &Users,
return ret;
}
void CZNC::AuthUser(CSmartPtr<CAuthBase> AuthClass) {
void CZNC::AuthUser(std::shared_ptr<CAuthBase> AuthClass) {
// TODO unless the auth module calls it, CUser::IsHostAllowed() is not honoured
bool bReturn = false;
GLOBALMODULECALL(OnLoginAttempt(AuthClass), &bReturn);