Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-05-08 02:23:07 UTC
Modified files:
ChangeLog ircd/channel.c ircd/m_trace.c
Log message:
Apply patches #1197032, #1194116.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.625 ircu2.10/ChangeLog:1.626
--- ircu2.10/ChangeLog:1.625 Sat May 7 17:56:04 2005
+++ ircu2.10/ChangeLog Sat May 7 19:22:56 2005
@@ -1,3 +1,14 @@
+2005-05-04 Reed Loden <[EMAIL PROTECTED]>
+
+ * ircd/m_trace.c (do_trace): Show the real nickname instead of the
+ numnick.
+
+2005-05-02 Jan Krueger <[EMAIL PROTECTED]>
+
+ * ircd/channel.c (member_can_send_to_channel): if the channel can only
+ be joined by users with accounts (+r), do not allow users without
+ accounts to speak.
+
2005-05-07 Michael Poole <[EMAIL PROTECTED]>
* ircd/numnicks.c (base64toip): Fix bugs in parsing IPv6
Index: ircu2.10/ircd/channel.c
diff -u ircu2.10/ircd/channel.c:1.129 ircu2.10/ircd/channel.c:1.130
--- ircu2.10/ircd/channel.c:1.129 Wed May 4 19:14:53 2005
+++ ircu2.10/ircd/channel.c Sat May 7 19:22:56 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Channel management and maintenance
- * @version $Id: channel.c,v 1.129 2005/05/05 02:14:53 entrope Exp $
+ * @version $Id: channel.c,v 1.130 2005/05/08 02:22:56 entrope Exp $
*/
#include "config.h"
@@ -655,6 +655,9 @@
*/
if (member->channel->mode.mode & MODE_MODERATED)
return 0;
+ /* If only logged in users may join and you're not one, you can't speak. */
+ if (member->channel->mode.mode & MODE_REGONLY && !IsAccount(member->user))
+ return 0;
/*
* If you're banned then you can't speak either.
* but because of the amount of CPU time that is_banned chews
Index: ircu2.10/ircd/m_trace.c
diff -u ircu2.10/ircd/m_trace.c:1.11 ircu2.10/ircd/m_trace.c:1.12
--- ircu2.10/ircd/m_trace.c:1.11 Fri Dec 10 21:14:03 2004
+++ ircu2.10/ircd/m_trace.c Sat May 7 19:22:57 2005
@@ -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_trace.c,v 1.11 2004/12/11 05:14:03 klmitch Exp $
+ * $Id: m_trace.c,v 1.12 2005/05/08 02:22:57 entrope Exp $
*/
/*
@@ -106,6 +106,7 @@
{
int i;
struct Client *acptr;
+ struct Client *acptr2;
const struct ConnectionClass* cl;
char* tname;
int doall;
@@ -260,14 +261,19 @@
*/
case STAT_SERVER:
- if (cli_serv(acptr)->user)
+ if (cli_serv(acptr)->user) {
+ if (!cli_serv(acptr)->by[0]
+ || !(acptr2 = findNUser(cli_serv(acptr)->by))
+ || (cli_user(acptr2) != cli_serv(acptr)->user))
+ acptr2 = NULL;
send_reply(sptr, RPL_TRACESERVER, conClass, link_s[i],
link_u[i], cli_name(acptr),
- (*(cli_serv(acptr))->by) ? cli_serv(acptr)->by : "*",
- cli_serv(acptr)->user->username,
cli_serv(acptr)->user->host,
+ acptr2 ? cli_name(acptr2) : "*",
+ cli_serv(acptr)->user->username,
+ cli_serv(acptr)->user->host,
CurrentTime - cli_lasttime(acptr),
CurrentTime - cli_serv(acptr)->timestamp);
- else
+ } else
send_reply(sptr, RPL_TRACESERVER, conClass, link_s[i],
link_u[i], cli_name(acptr),
(*(cli_serv(acptr))->by) ? cli_serv(acptr)->by : "*",
"*",
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
