diff options
| author | Peter Powell <petpow@saberuk.com> | 2013-07-10 15:23:46 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2013-08-10 14:04:09 +0100 |
| commit | 3d019b14ec0025ff38bbd40c868ddccd0b13d8a3 (patch) | |
| tree | c872541f332ffdea8691ed7ec40c7904adf8a69e /src/channels.cpp | |
| parent | 4509cbcc0b57f9f397af26f5e8dbe629499c2b24 (diff) | |
Require privs given on initial join to be in <options:defaultmodes>.
Diffstat (limited to 'src/channels.cpp')
| -rw-r--r-- | src/channels.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index d82ad6c23..c7913606f 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -162,6 +162,9 @@ void Channel::SetDefaultModes() ModeHandler* mode = ServerInstance->Modes->FindMode(*n, MODETYPE_CHANNEL); if (mode) { + if (mode->GetPrefixRank()) + continue; + if (mode->GetNumParams(true)) list.GetToken(parameter); else @@ -223,7 +226,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co if (!chan) { - privs = "o"; + privs = ServerInstance->Config->DefaultModes.substr(0, ServerInstance->Config->DefaultModes.find(' ')); if (override == false) { @@ -343,7 +346,7 @@ void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, boo for (std::string::const_iterator i = privs->begin(); i != privs->end(); ++i) { ModeHandler* mh = ServerInstance->Modes->FindMode(*i, MODETYPE_CHANNEL); - if (mh) + if (mh && mh->GetPrefixRank()) { std::string nick = user->nick; /* Set, and make sure that the mode handler knows this mode was now set */ |