CVSROOT : /home/coder-com/cvs
Module : ircu2.10
Branch tags: u2_10_11_01
Commit time: 2002-09-04 01:44:59 UTC
Modified files:
Tag: u2_10_11_01
ChangeLog include/patchlevel.h ircd/engine_poll.c ircd/m_invite.c
ircd/m_links.c ircd/m_map.c
Log message:
Author: Kev <[EMAIL PROTECTED]> and hikari <[EMAIL PROTECTED]>
Log message:
Change "IsOper" to "IsAnOper" in m_map.c and m_links.c; make invitations to
local channels actually be sent to local users; remove a troublesome
assertion in the poll engine.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.123 ircu2.10/ChangeLog:1.290.2.123.4.1
--- ircu2.10/ChangeLog:1.290.2.123 Mon Sep 2 10:34:35 2002
+++ ircu2.10/ChangeLog Tue Sep 3 20:44:48 2002
@@ -1,3 +1,21 @@
+2002-09-03 Kevin L Mitchell <[EMAIL PROTECTED]>
+
+ * include/patchlevel.h (PATCHLEVEL): bump patchlevel for
+ u2.10.11.01 development
+
+ * ircd/m_invite.c (m_invite): send the invite message to a local
+ user in the case of local channels
+
+ * ircd/engine_poll.c (engine_loop): remove an assertion which
+ isn't supposed to be being triggered, but somehow is
+
+2002-09-03 hikari <[EMAIL PROTECTED]>
+ * ircd/m_map.c: changed call from IsOper to IsAnOper to
+ pickup locals.
+
+ * ircd/m_links.c: changed call from IsOper to IsAnOper to
+ pickup locals.
+
2002-09-02 Kevin L Mitchell <[EMAIL PROTECTED]>
* include/patchlevel.h: release u2.10.11.00
Index: ircu2.10/include/patchlevel.h
diff -u ircu2.10/include/patchlevel.h:1.10.4.59
ircu2.10/include/patchlevel.h:1.10.4.59.4.1
--- ircu2.10/include/patchlevel.h:1.10.4.59 Mon Sep 2 10:29:35 2002
+++ ircu2.10/include/patchlevel.h Tue Sep 3 20:44:49 2002
@@ -15,10 +15,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: patchlevel.h,v 1.10.4.59 2002/09/02 15:29:35 kev Exp $
+ * $Id: patchlevel.h,v 1.10.4.59.4.1 2002/09/04 01:44:49 kev Exp $
*
*/
-#define PATCHLEVEL "00"
+#define PATCHLEVEL "01(dev)"
#define RELEASE ".11."
Index: ircu2.10/ircd/engine_poll.c
diff -u ircu2.10/ircd/engine_poll.c:1.4.2.1 ircu2.10/ircd/engine_poll.c:1.4.2.1.4.1
--- ircu2.10/ircd/engine_poll.c:1.4.2.1 Sat Jan 12 13:59:14 2002
+++ ircu2.10/ircd/engine_poll.c Tue Sep 3 20:44:49 2002
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: engine_poll.c,v 1.4.2.1 2002/01/12 19:59:14 kev Exp $
+ * $Id: engine_poll.c,v 1.4.2.1.4.1 2002/09/04 01:44:49 kev Exp $
*/
#include "config.h"
@@ -302,8 +302,6 @@
continue;
}
}
-
- assert(!(pollfdList[i].revents & POLLERR));
#ifdef POLLHUP
if (pollfdList[i].revents & POLLHUP) { /* hang-up on socket */
Index: ircu2.10/ircd/m_invite.c
diff -u ircu2.10/ircd/m_invite.c:1.10.2.1 ircu2.10/ircd/m_invite.c:1.10.2.1.4.1
--- ircu2.10/ircd/m_invite.c:1.10.2.1 Thu Apr 11 19:14:37 2002
+++ ircu2.10/ircd/m_invite.c Tue Sep 3 20:44:49 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_invite.c,v 1.10.2.1 2002/04/12 00:14:37 vampire Exp $
+ * $Id: m_invite.c,v 1.10.2.1.4.1 2002/09/04 01:44:49 kev Exp $
*/
/*
@@ -195,7 +195,7 @@
if (MyConnect(acptr))
add_invite(acptr, chptr);
- if (!IsLocalChannel(chptr->chname))
+ if (!IsLocalChannel(chptr->chname) || MyConnect(acptr))
sendcmdto_one(sptr, CMD_INVITE, acptr, "%s :%H", cli_name(acptr), chptr);
return 0;
Index: ircu2.10/ircd/m_links.c
diff -u ircu2.10/ircd/m_links.c:1.8.2.1 ircu2.10/ircd/m_links.c:1.8.2.1.4.1
--- ircu2.10/ircd/m_links.c:1.8.2.1 Wed Jul 17 17:55:40 2002
+++ ircu2.10/ircd/m_links.c Tue Sep 3 20:44:49 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_links.c,v 1.8.2.1 2002/07/17 22:55:40 kev Exp $
+ * $Id: m_links.c,v 1.8.2.1.4.1 2002/09/04 01:44:49 kev Exp $
*/
/*
@@ -114,7 +114,7 @@
char *mask;
struct Client *acptr;
- if (feature_bool(FEAT_HIS_LINKS) && !IsOper(sptr)) {
+ if (feature_bool(FEAT_HIS_LINKS) && !IsAnOper(sptr)) {
send_reply(sptr, RPL_ENDOFLINKS, parc < 2 ? "*" : parv[1]);
sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :%s %s", sptr,
"/LINKS has been disabled, from CFV-165. Visit ",
Index: ircu2.10/ircd/m_map.c
diff -u ircu2.10/ircd/m_map.c:1.9.2.1 ircu2.10/ircd/m_map.c:1.9.2.1.4.1
--- ircu2.10/ircd/m_map.c:1.9.2.1 Wed Jul 17 17:55:40 2002
+++ ircu2.10/ircd/m_map.c Tue Sep 3 20:44:49 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_map.c,v 1.9.2.1 2002/07/17 22:55:40 kev Exp $
+ * $Id: m_map.c,v 1.9.2.1.4.1 2002/09/04 01:44:49 kev Exp $
*/
/*
@@ -163,7 +163,7 @@
*/
int m_map(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
{
- if (feature_bool(FEAT_HIS_MAP) && !IsOper(sptr)) {
+ if (feature_bool(FEAT_HIS_MAP) && !IsAnOper(sptr)) {
sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :%s %s", sptr,
"/MAP has been disabled, from CFV-165. "
"Visit ", feature_str(FEAT_HIS_URLSERVERS));
----------------------- End of diff -----------------------
