Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2004-05-15 21:39:26 UTC
Modified files:
ChangeLog ircd/s_user.c
Log message:
Forward port 2.10.11 fixes for registration failures.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.411 ircu2.10/ChangeLog:1.412
--- ircu2.10/ChangeLog:1.411 Sat May 15 11:39:34 2004
+++ ircu2.10/ChangeLog Sat May 15 14:39:16 2004
@@ -1,4 +1,22 @@
-2004-05-15 beware <[EMAIL PROTECTED]>
+2004-05-15 Isomer <[EMAIL PROTECTED]>
+
+ [Original ChangeLog date: 2003-11-23 -MDP]
+
+ * ircd/s_user.c: Don't credit users with an extra attempt if they
+ are klined/glined, throttle them!
+
+2004-05-15 Jeekay <[EMAIL PROTECTED]>
+
+ [Original ChangeLog date: 2003-04-24 -MDP]
+
+ * ircd/s_user.c: Altered (K-lined) to depend on find_kill type
+
+2004-05-15 Michael Poole <[EMAIL PROTECTED]>
+
+ * ircd/s_user.c (hide_hostmask): Never send rejoins to a channel
+ when a zombie hides his hostmask.
+
+2004-05-15 beware <[EMAIL PROTECTED]>
[Original ChangeLog date: 2003-10-25 -MDP]
Index: ircu2.10/ircd/s_user.c
diff -u ircu2.10/ircd/s_user.c:1.67 ircu2.10/ircd/s_user.c:1.68
--- ircu2.10/ircd/s_user.c:1.67 Mon May 10 19:51:07 2004
+++ ircu2.10/ircd/s_user.c Sat May 15 14:39:16 2004
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: s_user.c,v 1.67 2004/05/11 02:51:07 entrope Exp $
+ * $Id: s_user.c,v 1.68 2004/05/15 21:39:16 entrope Exp $
*/
#include "config.h"
@@ -362,6 +362,7 @@
short badid = 0;
short digitgroups = 0;
struct User* user = cli_user(sptr);
+ int killreason;
char ip_base64[8];
user->last = CurrentTime;
@@ -432,7 +433,6 @@
&& strcmp(cli_passwd(sptr), aconf->passwd))
{
ServerStats->is_ref++;
- IPcheck_connect_fail(cli_ip(sptr));
send_reply(sptr, ERR_PASSWDMISMATCH);
return exit_client(cptr, sptr, &me, "Bad Password");
}
@@ -440,10 +440,11 @@
/*
* following block for the benefit of time-dependent K:-lines
*/
- if (find_kill(sptr)) {
+ killreason = find_kill(sptr);
+ if (killreason) {
ServerStats->is_ref++;
- IPcheck_connect_fail(cli_ip(sptr));
- return exit_client(cptr, sptr, &me, "K-lined");
+ return exit_client(cptr, sptr, &me,
+ (killreason == -1 ? "K-lined" : "G-lined"));
}
/*
* Check for mixed case usernames, meaning probably hacked. Jon2 3-94
@@ -1085,6 +1086,8 @@
*/
for (chan = cli_user(cptr)->channel; chan; chan = chan->next_channel)
{
+ if (IsZombie(chan))
+ continue;
/* For a user with no modes in a join-delayed channel, do not show
* the rejoin. */
if (!IsChanOp(chan) && !HasVoice(chan)
----------------------- End of diff -----------------------
