CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_11_03
Commit time: 2002-11-23 05:05:07 UTC
Modified files:
Tag: u2_10_11_03
ChangeLog ircd/channel.c ircd/m_join.c ircd/s_stats.c
Log message:
Author: Various (via Perry Lorier <[EMAIL PROTECTED]>
Log message:
2002-11-19 Perry Lorier <[EMAIL PROTECTED]>
* ircd/m_join.c: Make the protocol violation warning more verbose
* ircd/m_channel.c: OUTsiders OVERRIDE overly-noisy join patch.
* ircd/m_join.c: OUTsiders OVERRIDE +r patch.
* ircd/s_stats.c: fixed a little bug to allow local opers to get a
complete /stats k reply. -- Spike
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.125.2.8 ircu2.10/ChangeLog:1.290.2.125.2.9
--- ircu2.10/ChangeLog:1.290.2.125.2.8 Wed Oct 30 02:56:51 2002
+++ ircu2.10/ChangeLog Fri Nov 22 21:04:56 2002
@@ -1,3 +1,13 @@
+2002-11-19 Perry Lorier <[EMAIL PROTECTED]>
+ * ircd/m_join.c: Make the protocol violation warning more verbose
+
+ * ircd/m_channel.c: OUTsiders OVERRIDE overly-noisy join patch.
+
+ * ircd/m_join.c: OUTsiders OVERRIDE +r patch.
+
+ * ircd/s_stats.c: fixed a little bug to allow local opers to get a
+ complete /stats k reply. -- Spike
+
2002-10-30 Alex Badea <[EMAIL PROTECTED]>
* ircd/m_whois.c (do_whois): reply real host to the user himself,
Index: ircu2.10/ircd/channel.c
diff -u ircu2.10/ircd/channel.c:1.73.2.10.4.3 ircu2.10/ircd/channel.c:1.73.2.10.4.4
--- ircu2.10/ircd/channel.c:1.73.2.10.4.3 Sat Oct 19 07:20:16 2002
+++ ircu2.10/ircd/channel.c Fri Nov 22 21:04:56 2002
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: channel.c,v 1.73.2.10.4.3 2002/10/19 14:20:16 klmitch Exp $
+ * $Id: channel.c,v 1.73.2.10.4.4 2002/11/23 05:04:56 isomer Exp $
*/
#include "config.h"
@@ -1018,7 +1018,8 @@
a HACK(4) notice will be sent if he would not have been supposed
to join normally. */
if (IsLocalChannel(chptr->chname) && HasPriv(sptr, PRIV_WALK_LCHAN) &&
- !BadPtr(key) && compall("OVERRIDE",key) == 0)
+ !BadPtr(key) && compall("OVERRIDE",key) == 0
+ && compall("OVERRIDE",chptr->mode.key) != 0)
overrideJoin = MAGIC_OPER_OVERRIDE;
if (chptr->mode.mode & MODE_INVITEONLY)
Index: ircu2.10/ircd/m_join.c
diff -u ircu2.10/ircd/m_join.c:1.16.2.2 ircu2.10/ircd/m_join.c:1.16.2.2.2.1
--- ircu2.10/ircd/m_join.c:1.16.2.2 Thu Oct 10 02:13:25 2002
+++ ircu2.10/ircd/m_join.c Fri Nov 22 21:04:57 2002
@@ -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: m_join.c,v 1.16.2.2 2002/10/10 09:13:25 isomer Exp $
+ * $Id: m_join.c,v 1.16.2.2.2.1 2002/11/23 05:04:57 isomer Exp $
*/
/*
@@ -246,6 +246,14 @@
case ERR_BADCHANNELKEY:
i = 'k';
break;
+
+ case ERR_NEEDREGGEDNICK:
+ i = 'r';
+ break;
+
+ default:
+ i = '?';
+ break;
}
/* send accountability notice */
@@ -299,7 +307,11 @@
char *name;
if (IsServer(sptr)) {
- return protocol_violation(sptr,"%s tried to JOIN a channel, duh!",
cli_name(sptr));
+ return protocol_violation(sptr,
+ "%s tried to JOIN %s, duh!",
+ cli_name(sptr),
+ (parc < 2 || *parv[1] == '\0') ? "a channel":argv[1]
+ );
}
if (parc < 2 || *parv[1] == '\0')
Index: ircu2.10/ircd/s_stats.c
diff -u ircu2.10/ircd/s_stats.c:1.16.2.6 ircu2.10/ircd/s_stats.c:1.16.2.6.8.1
--- ircu2.10/ircd/s_stats.c:1.16.2.6 Fri Jul 26 20:39:48 2002
+++ ircu2.10/ircd/s_stats.c Fri Nov 22 21:04:57 2002
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: s_stats.c,v 1.16.2.6 2002/07/27 03:39:48 kev Exp $
+ * $Id: s_stats.c,v 1.16.2.6.8.1 2002/11/23 05:04:57 isomer Exp $
*/
#include "config.h"
@@ -196,7 +196,7 @@
char* host;
const struct DenyConf* conf;
- if (!IsOper(sptr))
+ if (!IsAnOper(sptr))
limit_query = 1;
if (!mask) {
----------------------- End of diff -----------------------
