]>
Commit | Line | Data |
---|---|---|
edb26b39 P |
1 | # HG changeset patch |
2 | # Parent 18bf4aaa5854bbfc71fde928990a073da78a8496 | |
3 | ||
4 | diff -r 18bf4aaa5854 ircd/ircd_relay.c | |
5 | --- a/ircd/ircd_relay.c Fri Jul 19 22:01:42 2013 +0100 | |
6 | +++ b/ircd/ircd_relay.c Fri Jul 19 22:05:24 2013 +0100 | |
7 | @@ -305,6 +305,10 @@ | |
8 | if (host) | |
9 | *--host = '%'; | |
10 | ||
11 | + /* slug: I don't think this is required, but I might have missed something */ | |
12 | + if (IsAccountOnly(acptr) && !IsAccount(sptr) && !IsXtraOp(sptr)) | |
13 | + return; | |
14 | + | |
15 | if (!(is_silenced(sptr, acptr))) | |
16 | sendcmdto_one(sptr, CMD_PRIVATE, acptr, "%s :%s", name, text); | |
17 | } | |
18 | @@ -354,6 +358,9 @@ | |
19 | if (host) | |
20 | *--host = '%'; | |
21 | ||
22 | + if (IsAccountOnly(acptr) && !IsAccount(sptr) && !IsXtraOp(sptr)) | |
23 | + return; | |
24 | + | |
25 | if (!(is_silenced(sptr, acptr))) | |
26 | sendcmdto_one(sptr, CMD_NOTICE, acptr, "%s :%s", name, text); | |
27 | } | |
28 | @@ -388,7 +395,7 @@ | |
29 | * deny the message | |
30 | */ | |
31 | ||
32 | - if (IsAccountOnly(acptr) && !IsAccount(sptr) && !IsOper(sptr)) { | |
33 | + if (IsAccountOnly(acptr) && !IsAccount(sptr) && !IsXtraOp(sptr)) { | |
34 | send_reply(sptr, ERR_ACCOUNTONLY, cli_name(acptr), feature_str(FEAT_URLREG)); | |
35 | return; | |
36 | } | |
37 | @@ -434,7 +441,7 @@ | |
38 | * deny the message | |
39 | */ | |
40 | ||
41 | - if (IsAccountOnly(acptr) && !IsAccount(sptr) && !IsOper(sptr)) | |
42 | + if (IsAccountOnly(acptr) && !IsAccount(sptr) && !IsXtraOp(sptr)) | |
43 | return; | |
44 | ||
45 | /* | |
46 | diff -r 18bf4aaa5854 ircd/m_invite.c | |
47 | --- a/ircd/m_invite.c Fri Jul 19 22:01:42 2013 +0100 | |
48 | +++ b/ircd/m_invite.c Fri Jul 19 22:05:24 2013 +0100 | |
49 | @@ -166,7 +166,7 @@ | |
50 | ||
51 | /* If we get here, it was a VALID and meaningful INVITE */ | |
52 | ||
53 | - if (IsAccountOnly(acptr) && !IsAccount(sptr) && !IsOper(sptr)) { | |
54 | + if (IsAccountOnly(acptr) && !IsAccount(sptr) && !IsXtraOp(sptr)) { | |
55 | send_reply(sptr, ERR_ACCOUNTONLY, cli_name(acptr), feature_str(FEAT_URLREG)); | |
56 | return 0; | |
57 | } |