Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2004-05-15 22:11:56 UTC
Modified files:
ircd/s_user.c ircd/s_misc.c ircd/s_err.c ChangeLog
Log message:
Finish forward porting s_user.c changes.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.412 ircu2.10/ChangeLog:1.413
--- ircu2.10/ChangeLog:1.412 Sat May 15 14:39:16 2004
+++ ircu2.10/ChangeLog Sat May 15 15:11:45 2004
@@ -1,4 +1,26 @@
-2004-05-15 Isomer <[EMAIL PROTECTED]>
+2004-05-15 Isomer <[EMAIL PROTECTED]>
+
+ [Original ChangeLog date: 2003-11-05 -MDP]
+
+ * ircd/s_misc.c, ircd/s_user.c: added numnick to SNO_CONNEXIT
+ messages (so you can match EXIT's to CONN's)
+
+2004-05-15 Reed Loden <[EMAIL PROTECTED]>
+
+ [Original ChangeLog date: 2003-05-01 -MDP]
+
+ * ircd/s_err.c: Added network to text and edited 001 a bit.
+
+ * ircd/s_user.c: Send network with 001.
+
+2004-05-15 Michael Poole <[EMAIL PROTECTED]>
+
+ * ircd/s_user.c (add_target): Move free target invite check...
+
+ * ircd/s_user.c (check_target_limit): to here, matching 2.10.11's
+ behavior.
+
+2004-05-15 Isomer <[EMAIL PROTECTED]>
[Original ChangeLog date: 2003-11-23 -MDP]
@@ -11,10 +33,12 @@
* ircd/s_user.c: Altered (K-lined) to depend on find_kill type
-2004-05-15 Michael Poole <[EMAIL PROTECTED]>
+2004-05-15 splidge <[EMAIL PROTECTED]>
+
+ [Original ChangeLog date: 2003-09-03 -MDP]
- * ircd/s_user.c (hide_hostmask): Never send rejoins to a channel
- when a zombie hides his hostmask.
+ * ircd/s_user.c: Made hide_hostmask() not show bogus joins for
+ channels where the user is a zombie.
2004-05-15 beware <[EMAIL PROTECTED]>
Index: ircu2.10/ircd/s_err.c
diff -u ircu2.10/ircd/s_err.c:1.45 ircu2.10/ircd/s_err.c:1.46
--- ircu2.10/ircd/s_err.c:1.45 Mon May 10 19:10:26 2004
+++ ircu2.10/ircd/s_err.c Sat May 15 15:11:44 2004
@@ -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: s_err.c,v 1.45 2004/05/11 02:10:26 entrope Exp $
+ * $Id: s_err.c,v 1.46 2004/05/15 22:11:44 entrope Exp $
*/
#include "config.h"
@@ -30,7 +30,7 @@
/* 000 */
{ 0 },
/* 001 */
- { RPL_WELCOME, ":Welcome to the Internet Relay Network%s%s, %s", "001" },
+ { RPL_WELCOME, ":Welcome to the %s IRC Network%s%s, %s", "001" },
/* 002 */
{ RPL_YOURHOST, ":Your host is %s, running version %s", "002" },
/* 003 */
@@ -1034,7 +1034,7 @@
/* 500 */
{ 0 },
/* 501 */
- { ERR_UMODEUNKNOWNFLAG, ":Unknown MODE flag", "501" },
+ { ERR_UMODEUNKNOWNFLAG, "%c :Unknown user MODE flag", "501" },
/* 502 */
{ ERR_USERSDONTMATCH, ":Cant change mode for other users", "502" },
/* 503 */
Index: ircu2.10/ircd/s_misc.c
diff -u ircu2.10/ircd/s_misc.c:1.33 ircu2.10/ircd/s_misc.c:1.34
--- ircu2.10/ircd/s_misc.c:1.33 Tue Jan 7 19:17:20 2003
+++ ircu2.10/ircd/s_misc.c Sat May 15 15:11:44 2004
@@ -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: s_misc.c,v 1.33 2003/01/08 03:17:20 klmitch Exp $
+ * $Id: s_misc.c,v 1.34 2004/05/15 22:11:44 entrope Exp $
*/
#include "config.h"
@@ -398,19 +398,23 @@
if (feature_bool(FEAT_CONNEXIT_NOTICES) && IsUser(victim))
sendto_opmask_butone(0, SNO_CONNEXIT,
- "Client exiting: %s ([EMAIL PROTECTED]) [%s] [%s]",
+ "Client exiting: %s ([EMAIL PROTECTED]) [%s] [%s] <%s%s>",
cli_name(victim), cli_user(victim)->username,
cli_user(victim)->host, comment,
- ircd_ntoa((const char*) &(cli_ip(victim))));
+ ircd_ntoa((const char*) &(cli_ip(victim))),
+ NumNick(victim) /* two %s's */);
update_load();
on_for = CurrentTime - cli_firsttime(victim);
if (IsUser(victim))
- log_write(LS_USER, L_TRACE, 0, "%s (%3d:%02d:%02d): [EMAIL PROTECTED] (%s)",
- myctime(cli_firsttime(victim)), on_for / 3600,
- (on_for % 3600) / 60, on_for % 60, cli_user(victim)->username,
- cli_sockhost(victim), cli_name(victim));
+ log_write(LS_USER, L_TRACE, 0, "%Tu %i [EMAIL PROTECTED] %s %s %s%s %s :%s",
+ cli_firsttime(victim), on_for,
+ cli_user(victim)->username, cli_sockhost(victim),
+ ircd_ntoa((const char*) &(cli_ip(victim))),
+ IsAccount(victim) ? cli_username(victim) : "0",
+ NumNick(victim), /* two %s's */
+ cli_name(victim), cli_info(victim));
if (victim != cli_from(killer) /* The source knows already */
&& IsClient(victim)) /* Not a Ping struct or Log file */
Index: ircu2.10/ircd/s_user.c
diff -u ircu2.10/ircd/s_user.c:1.68 ircu2.10/ircd/s_user.c:1.69
--- ircu2.10/ircd/s_user.c:1.68 Sat May 15 14:39:16 2004
+++ ircu2.10/ircd/s_user.c Sat May 15 15:11:44 2004
@@ -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: s_user.c,v 1.68 2004/05/15 21:39:16 entrope Exp $
+ * $Id: s_user.c,v 1.69 2004/05/15 22:11:44 entrope Exp $
*/
#include "config.h"
@@ -543,6 +543,7 @@
send_reply(sptr,
RPL_WELCOME,
+ feature_str(FEAT_NETWORK),
feature_str(FEAT_PROVIDER) ? " via " : "",
feature_str(FEAT_PROVIDER) ? feature_str(FEAT_PROVIDER) : "",
nick);
@@ -562,9 +563,10 @@
set_snomask(sptr, cli_snomask(sptr) & SNO_NOISY, SNO_ADD);
if (feature_bool(FEAT_CONNEXIT_NOTICES))
sendto_opmask_butone(0, SNO_CONNEXIT,
- "Client connecting: %s ([EMAIL PROTECTED]) [%s] {%d}",
+ "Client connecting: %s ([EMAIL PROTECTED]) [%s] {%d} [%s]
<%s%s>",
cli_name(sptr), user->username, user->host,
- cli_sock_ip(sptr), get_client_class(sptr));
+ cli_sock_ip(sptr), get_client_class(sptr),
+ cli_info(sptr), NumNick(cptr) /* two %s's */);
IPcheck_connect_succeeded(sptr);
/*
@@ -845,8 +847,6 @@
targets = cli_targets(sptr);
- if (IsChannelName(cli_name(sptr)) && IsInvited(sptr, target))
- return;
/*
* Already in table?
*/
@@ -881,6 +881,10 @@
assert(cli_local(sptr));
targets = cli_targets(sptr);
+ /* If user is invited to channel, give him/her a free target */
+ if (IsChannelName(name) && IsInvited(sptr, target))
+ return 0;
+
/*
* Same target as last time?
*/
@@ -1267,6 +1271,7 @@
do_host_hiding = 1;
break;
default:
+ send_reply(sptr, ERR_UMODEUNKNOWNFLAG, *m);
break;
}
}
----------------------- End of diff -----------------------
