diff options
| author | DukePyrolator <DukePyrolator@anope.org> | 2010-12-14 08:13:09 +0100 |
|---|---|---|
| committer | DukePyrolator <DukePyrolator@anope.org> | 2010-12-14 08:13:09 +0100 |
| commit | 02476332ea2f5ab3fd766e0ca9d83d67a9a9f122 (patch) | |
| tree | 4e75a625d87bea08faf16619fb27ff75f83d8c19 /include | |
| parent | 6a43886807c74503dd89ad6bae0e5605a3e21210 (diff) | |
| parent | 49d3c97b677f319460146803004066dfd3d19089 (diff) | |
Merge branch '1.9' of ssh://anope.git.sourceforge.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'include')
| -rw-r--r-- | include/extern.h | 2 | ||||
| -rw-r--r-- | include/services.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/extern.h b/include/extern.h index c30914c9e..59d0c238e 100644 --- a/include/extern.h +++ b/include/extern.h @@ -29,7 +29,7 @@ E IRCdMessage *ircdmessage; E void kill_user(const Anope::string &source, User *user, const Anope::string &reason); E bool bad_password(User *u); -E void common_unban(ChannelInfo *ci, User *u); +E void common_unban(ChannelInfo *ci, User *u, bool full = false); E BotInfo *BotServ; E BotInfo *ChanServ; diff --git a/include/services.h b/include/services.h index 75aa4905c..645afc911 100644 --- a/include/services.h +++ b/include/services.h @@ -441,7 +441,6 @@ struct IRCDVar int join2msg; /* Join 2 Message */ int chansqline; /* Supports Channel Sqlines */ int quitonkill; /* IRCD sends QUIT when kill */ - int svsmode_unban; /* svsmode can be used to unban */ int vident; /* Supports vidents */ int svshold; /* Supports svshold */ int tsonmode; /* Timestamp on mode changes */ @@ -786,9 +785,10 @@ class Entry : public Flags<EntryType> /** Check if this entry matches a user * @param u The user + * @param full True to match against a users real host and IP * @return true on match */ - bool Matches(User *u) const; + bool Matches(User *u, bool full = false) const; }; /*************************************************************************/ @@ -968,7 +968,6 @@ class CoreExport IRCDProto virtual void SendSZLineDel(const XLine *) { } virtual void SendSZLine(const XLine *) { } virtual void SendSGLine(const XLine *) { } - virtual void SendBanDel(const Channel *, const Anope::string &) { } virtual void SendSVSModeChan(const Channel *, const Anope::string &, const Anope::string &) { } virtual void SendUnregisteredNick(const User *) { } virtual void SendCTCP(const BotInfo *bi, const Anope::string &dest, const char *fmt, ...); |