Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-08-17 02:07:20 UTC
Modified files:
ChangeLog ircd/channel.c
Log message:
Avoid overwriting part of a server-set ban's banstr field.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.672 ircu2.10/ChangeLog:1.673
--- ircu2.10/ChangeLog:1.672 Tue Aug 16 18:57:02 2005
+++ ircu2.10/ChangeLog Tue Aug 16 19:07:10 2005
@@ -1,5 +1,10 @@
2005-08-16 Michael Poole <[EMAIL PROTECTED]>
+ * ircd/channel.c (mode_parse_ban): Avoid overwriting part of
+ newban->banstr[] when the source is a server. (Spotted by jcq.)
+
+2005-08-16 Michael Poole <[EMAIL PROTECTED]>
+
* ircd/channel.c (joinbuf_join): Switch to &his instead of &me for
announcements to local users in a channel.
Index: ircu2.10/ircd/channel.c
diff -u ircu2.10/ircd/channel.c:1.141 ircu2.10/ircd/channel.c:1.142
--- ircu2.10/ircd/channel.c:1.141 Tue Aug 16 18:57:03 2005
+++ ircu2.10/ircd/channel.c Tue Aug 16 19:07:10 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Channel management and maintenance
- * @version $Id: channel.c,v 1.141 2005/08/17 01:57:03 entrope Exp $
+ * @version $Id: channel.c,v 1.142 2005/08/17 02:07:10 entrope Exp $
*/
#include "config.h"
@@ -2819,7 +2819,7 @@
newban->flags = ((state->dir == MODE_ADD) ? BAN_ADD : BAN_DEL)
| (*flag_p == MODE_BAN ? 0 : BAN_EXCEPTION);
set_ban_mask(newban, collapse(pretty_mask(t_str)));
- ircd_strncpy(newban->who, cli_name(state->sptr), HOSTLEN);
+ ircd_strncpy(newban->who, IsUser(state->sptr) ? cli_name(state->sptr) : "*",
NICKLEN);
newban->when = TStime();
apply_ban(&state->chptr->banlist, newban, 0);
}
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
