cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Automated merge with ssh://hg@bitbucket.org/uranium/shadowircd/

This commit is contained in:
JD Horelick 2010-02-25 22:57:32 -05:00
parent 0099f31acf fc551dced3
commit f966f567b8
7 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
help/opers/dline
View File

@ -1,9 +1,9 @@
DLINE [duration] <ip> :[reason]
Adds a DLINE to the ircd.conf or klines.conf file
which will deny any connections from the IP address
of the banned client. The banned client will receive
a message saying he/she is banned with reason [reason]
Adds a DLINE to the database which will deny any
connections from the IP address of the banned client.
The banned client will receive a message saying
he/she is banned with reason [reason].
Duration is optional, and is in minutes.

4
help/opers/kline
View File

@ -1,13 +1,13 @@
KLINE <user@host> :[reason] [| oper reason]
Adds a KLINE to the kline.conf file which will ban the
Adds a KLINE to the database which will ban the
specified user from using this server. The banned
client will receive a message saying he/she is banned
with reason [reason].
If an oper reason is added (the pipe must be specified
to seperate the fields) this will be added into the
kline.conf but will not be shown to the user when they
database but will not be shown to the user when they
are given the kline reason.
KLINE <user@ip.ip.ip.ip> :[reason] [| oper reason]

2
help/opers/rehash
View File

@ -4,7 +4,7 @@ When no [option] is given, ircd will re-read the
ircd.conf file.
[option] can be one of the following:
BANS - Re-reads kline.conf, dline.conf, resv.conf and xline.conf
BANS - Re-reads kline/dline/resv/xline database
DNS - Re-read the /etc/resolv.conf file
HELP - Re-reads help files
MOTD - Re-reads MOTD file

2
help/opers/resv
View File

@ -1,7 +1,7 @@
RESV [time] <channel|nick> :<reason>
Reserves a channel or nickname from use. If [time] is not specified this
is added to resv.conf, otherwise is temporary for [time] minutes.
is added to the database, otherwise is temporary for [time] minutes.
Nick resvs accept the same wildcard chars as xlines.
Channel resvs only use exact string comparisons.

3
help/opers/unresv
View File

@ -2,5 +2,4 @@ UNRESV <channel|nick>
-- Remove a RESV on a channel or nick
Will attempt to remove the resv for the given
channel/nick. If the resv is ircd.conf based,
the resv will not be removed.
channel/nick.

2
help/opers/xline
View File

@ -1,7 +1,7 @@
XLINE [time] <gecos> :<reason>
Bans by gecos (aka 'real name') field. If [time] is not specified
this is added to xline.conf, otherwise is temporary for [time]
this is added to the database, otherwise is temporary for [time]
minutes.
Eg. /quote xline eggdrop?bot :no bots

2
modules/m_pong.c
View File

@ -103,7 +103,7 @@ mr_pong(struct Client *client_p, struct Client *source_p, int parc, const char *
{
if(parc == 2 && !EmptyString(parv[1]))
{
if(ConfigFileEntry.ping_cookie && source_p->user && source_p->name[0])
if(ConfigFileEntry.ping_cookie && source_p->flags & FLAGS_SENTUSER && source_p->name[0])
{
unsigned long incoming_ping = strtoul(parv[1], NULL, 16);
if(incoming_ping)