diff options
| author | Daniel De Graaf <danieldg@inspircd.org> | 2011-04-18 21:48:05 -0400 |
|---|---|---|
| committer | Daniel De Graaf <danieldg@inspircd.org> | 2011-04-18 21:48:05 -0400 |
| commit | 7aab0d12db670fea68a258d9ae2b05ea5c4615be (patch) | |
| tree | 53c10401dd88f36ae26daf73cf32abaf0855bb5e /src | |
| parent | a07ad071563e924664cbf15e98557f9d4838062e (diff) | |
| parent | 00d5b1e12c5f3735e23ae29f6de505fb2d868a5a (diff) | |
Merge commit 'refs/merge-requests/5' of git://gitorious.org/inspircd/inspircd into insp20
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/m_silence.cpp | 2 | ||||
| -rw-r--r-- | src/server.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index bd1e1ffe0..e99644298 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -317,7 +317,7 @@ class ModuleSilence : public Module { if (IS_LOCAL(i->first)) { - if (MatchPattern(i->first, sender, public_silence) == MOD_RES_ALLOW) + if (MatchPattern(i->first, sender, public_silence) == MOD_RES_DENY) { exempt_list.insert(i->first); } diff --git a/src/server.cpp b/src/server.cpp index 8c8e1b0dc..91b911ff2 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -75,9 +75,9 @@ void InspIRCd::BuildISupport() { // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it... std::stringstream v; - v << "WALLCHOPS WALLVOICES MODES=" << Config->Limits.MaxModes - 1 << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << Config->Limits.NickMax - 1; - v << " CASEMAPPING=rfc1459 STATUSMSG=" << Modes->BuildPrefixes(false) << " CHARSET=ascii TOPICLEN=" << Config->Limits.MaxTopic - 1 << " KICKLEN=" << Config->Limits.MaxKick - 1 << " MAXTARGETS=" << Config->MaxTargets - 1; - v << " AWAYLEN=" << Config->Limits.MaxAway - 1 << " CHANMODES=" << this->Modes->GiveModeList(MASK_CHANNEL) << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU"; + v << "WALLCHOPS WALLVOICES MODES=" << Config->Limits.MaxModes << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << Config->Limits.NickMax; + v << " CASEMAPPING=rfc1459 STATUSMSG=" << Modes->BuildPrefixes(false) << " CHARSET=ascii TOPICLEN=" << Config->Limits.MaxTopic << " KICKLEN=" << Config->Limits.MaxKick << " MAXTARGETS=" << Config->MaxTargets; + v << " AWAYLEN=" << Config->Limits.MaxAway << " CHANMODES=" << this->Modes->GiveModeList(MASK_CHANNEL) << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU"; Config->data005 = v.str(); FOREACH_MOD(I_On005Numeric,On005Numeric(Config->data005)); Config->Update005(); |