projects
/
ircu2.10.12-pk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt to fix SF bug #2568366 (sending JOIN before hitting a target limit).
[ircu2.10.12-pk.git]
/
ircd
/
s_user.c
diff --git
a/ircd/s_user.c
b/ircd/s_user.c
index 1fdfcbf323751eaaee06cd4f28479c12ab7971cb..a989a06d00778160d48901cf8c59506261790fd6 100644
(file)
--- a/
ircd/s_user.c
+++ b/
ircd/s_user.c
@@
-702,10
+702,6
@@
int check_target_limit(struct Client *sptr, void *target, const char *name,
assert(cli_local(sptr));
targets = cli_targets(sptr);
assert(cli_local(sptr));
targets = cli_targets(sptr);
- /* If user is invited to channel, give him/her a free target */
- if (IsChannelName(name) && IsInvited(sptr, target))
- return 0;
-
/*
* Same target as last time?
*/
/*
* Same target as last time?
*/
@@
-723,6
+719,10
@@
int check_target_limit(struct Client *sptr, void *target, const char *name,
*/
if (!created) {
if (CurrentTime < cli_nexttarget(sptr)) {
*/
if (!created) {
if (CurrentTime < cli_nexttarget(sptr)) {
+ /* If user is invited to channel, give him/her a free target */
+ if (IsChannelName(name) && IsInvited(sptr, target))
+ return 0;
+
if (cli_nexttarget(sptr) - CurrentTime < TARGET_DELAY + 8) {
/*
* No server flooding
if (cli_nexttarget(sptr) - CurrentTime < TARGET_DELAY + 8) {
/*
* No server flooding