[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed
Brought to you by:
zolty
Menu
▾
▴
[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed
|
From: Toni G. <zo...@us...> - 2005-05-23 08:59:10
|
CVSROOT : /cvsroot/irc-dev
Module : ircd-ircdev
Commit time: 2005-05-23 08:58:47 UTC
Modified files:
ChangeLog ChangeLog.es include/patchlevel.h ircd/s_conf.c
ircd/s_serv.c ircd/s_user.c
Log message:
Author: zoltan <zo...@ir...>
Log message:
2005-05-23 Toni García <zo...@ir...> 1.0.alpha36
* Arreglos URGENTES
---------------------- diff included ----------------------
Index: ircd-ircdev/ChangeLog
diff -u ircd-ircdev/ChangeLog:1.37 ircd-ircdev/ChangeLog:1.38
--- ircd-ircdev/ChangeLog:1.37 Mon May 16 04:31:19 2005
+++ ircd-ircdev/ChangeLog Mon May 23 01:58:36 2005
@@ -1,10 +1,13 @@
#
# ChangeLog for ircd-ircdev
#
-# $Id: ChangeLog,v 1.37 2005/05/16 11:31:19 zolty Exp $
+# $Id: ChangeLog,v 1.38 2005/05/23 08:58:36 zolty Exp $
#
# Insert new changes at beginning of the change list.
#
+2005-05-23 Toni García <zo...@ir...> 1.0.alpha36
+ * URGENT bugfixes
+
2005-05-16 Toni García <zo...@ir...> 1.0.alpha35
* Testing tools
Index: ircd-ircdev/ChangeLog.es
diff -u ircd-ircdev/ChangeLog.es:1.37 ircd-ircdev/ChangeLog.es:1.38
--- ircd-ircdev/ChangeLog.es:1.37 Mon May 16 04:31:19 2005
+++ ircd-ircdev/ChangeLog.es Mon May 23 01:58:36 2005
@@ -1,10 +1,13 @@
#
# Log de Cambios para ircd-ircdev
#
-# $Id: ChangeLog.es,v 1.37 2005/05/16 11:31:19 zolty Exp $
+# $Id: ChangeLog.es,v 1.38 2005/05/23 08:58:36 zolty Exp $
#
# Insertar los nuevos cambios al principio de esta lista de cambios.
#
+2005-05-23 Toni García <zo...@ir...> 1.0.alpha36
+ * Arreglos URGENTES
+
2005-05-16 Toni García <zo...@ir...> 1.0.alpha35
* Utilidades de Testing
Index: ircd-ircdev/include/patchlevel.h
diff -u ircd-ircdev/include/patchlevel.h:1.36 ircd-ircdev/include/patchlevel.h:1.37
--- ircd-ircdev/include/patchlevel.h:1.36 Mon May 16 04:31:20 2005
+++ ircd-ircdev/include/patchlevel.h Mon May 23 01:58:37 2005
@@ -17,10 +17,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: patchlevel.h,v 1.36 2005/05/16 11:31:20 zolty Exp $
+ * $Id: patchlevel.h,v 1.37 2005/05/23 08:58:37 zolty Exp $
*
*/
-#define PATCHLEVEL ".alpha35"
+#define PATCHLEVEL ".alpha36"
#define RELEASE "1.0"
Index: ircd-ircdev/ircd/s_conf.c
diff -u ircd-ircdev/ircd/s_conf.c:1.16 ircd-ircdev/ircd/s_conf.c:1.17
--- ircd-ircdev/ircd/s_conf.c:1.16 Mon May 16 03:17:27 2005
+++ ircd-ircdev/ircd/s_conf.c Mon May 23 01:58:37 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief ircd configuration file driver
- * @version $Id: s_conf.c,v 1.16 2005/05/16 10:17:27 zolty Exp $
+ * @version $Id: s_conf.c,v 1.17 2005/05/23 08:58:37 zolty Exp $
*/
#include "config.h"
@@ -1118,6 +1118,7 @@
* added a check against the user's IP address to find_gline() -Kev
*/
send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.", GlineReason(agline));
+ return -2;
}
return 0;
Index: ircd-ircdev/ircd/s_serv.c
diff -u ircd-ircdev/ircd/s_serv.c:1.11 ircd-ircdev/ircd/s_serv.c:1.12
--- ircd-ircdev/ircd/s_serv.c:1.11 Mon May 16 03:17:27 2005
+++ ircd-ircdev/ircd/s_serv.c Mon May 23 01:58:37 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Miscellaneous server support functions.
- * @version $Id: s_serv.c,v 1.11 2005/05/16 10:17:27 zolty Exp $
+ * @version $Id: s_serv.c,v 1.12 2005/05/23 08:58:37 zolty Exp $
*/
#include "config.h"
@@ -140,9 +140,6 @@
feature_bool(FEAT_HUB) ? "h" : "",
*(cli_info(&me)) ? cli_info(&me) : "IRCers United");
-#if defined(DDB)
- /* ddb_burst(cptr); */
-#endif
/*
* Don't charge this IP# for connecting
* XXX - if this comes from a server port, it will not have been added
Index: ircd-ircdev/ircd/s_user.c
diff -u ircd-ircdev/ircd/s_user.c:1.18 ircd-ircdev/ircd/s_user.c:1.19
--- ircd-ircdev/ircd/s_user.c:1.18 Mon May 16 03:17:27 2005
+++ ircd-ircdev/ircd/s_user.c Mon May 23 01:58:37 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Miscellaneous user-related helper functions.
- * @version $Id: s_user.c,v 1.18 2005/05/16 10:17:27 zolty Exp $
+ * @version $Id: s_user.c,v 1.19 2005/05/23 08:58:37 zolty Exp $
*/
#include "config.h"
@@ -822,8 +822,9 @@
* Esta comprobacion solo se va a hacer si
* el usuario es local y no esta haciendo nick flood.
*/
- if (MyConnect(cptr) && !IsIdentify(flags) && (ddb = ddb_find_key(DDB_NICKDB, (char *)nick))
- && (CurrentTime >= cli_nextnick(cptr)))
+ if (!IsServer(cptr) && MyConnect(cptr) && !IsIdentify(flags)
+ && (ddb = ddb_find_key(DDB_NICKDB, (char *)nick))
+ && (CurrentTime >= cli_nextnick(sptr)))
{
const char *name;
int nick_forbid = 0;
@@ -996,11 +997,11 @@
* if client is on any channels where it is currently
* banned. If so, do not allow the nick change to occur.
*/
- if (MyUser(sptr) && !IsRenamed(flags))
+ if (MyUser(sptr))
{
const char* channel_name;
struct Membership *member;
- if ((channel_name = find_no_nickchange_channel(sptr))) {
+ if ((channel_name = find_no_nickchange_channel(sptr)) && !IsRenamed(flags)) {
return send_reply(cptr, ERR_BANNICKCHANGE, channel_name);
}
/*
@@ -1011,7 +1012,7 @@
* however, allow to do two nick changes immediately after another
* before limiting the nick flood. -Run
*/
- if (CurrentTime < cli_nextnick(cptr))
+ if ((CurrentTime < cli_nextnick(cptr)) && !IsRenamed(flags))
{
cli_nextnick(cptr) += 2;
send_reply(cptr, ERR_NICKTOOFAST, parv[1],
----------------------- End of diff -----------------------
|
