Finish forward porting s_user.c changes.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1062 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 8dc2146b41b31dd44fd43cb99e19611d6edb965a..1e1da377ac99747ebf077ffdb874f4588fb5c51a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,26 @@
-2004-05-15 Isomer <isomer@undernet.org>
+2004-05-15  Isomer <isomer@undernet.org>
+
+       [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 <reed@reedloden.com>
+
+       [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 <mdpoole@troilus.org>
+
+       * 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 <isomer@undernet.org>
 
        [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 <mdpoole@troilus.org>
+2004-05-15  splidge <splidge@quakenet.org>
+
+       [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 <steendijk@xs4all.nl>
 

diff --git a/ircd/s_err.c b/ircd/s_err.c
index 6145a1cb80ea2ccc109569138b6954dcd29ebe37..a4b620ba5900036d2dec69864e2fa794d75918d9 100644 (file)
--- a/ircd/s_err.c
+++ b/ircd/s_err.c
@@ -30,7 +30,7 @@ static Numeric replyTable[] = {
 /* 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 @@ static Numeric replyTable[] = {
 /* 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 */

diff --git a/ircd/s_misc.c b/ircd/s_misc.c
index 766043286ef5dd312a743f50f500bb89d4b95f55..bf37eb95eb42a68aee0c542c3bf17593c75fa08e 100644 (file)
--- a/ircd/s_misc.c
+++ b/ircd/s_misc.c
@@ -398,19 +398,23 @@ int exit_client(struct Client *cptr,    /* Connection being handled by
 
     if (feature_bool(FEAT_CONNEXIT_NOTICES) && IsUser(victim))
       sendto_opmask_butone(0, SNO_CONNEXIT,
-                           "Client exiting: %s (%s@%s) [%s] [%s]",
+                           "Client exiting: %s (%s@%s) [%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): %s@%s (%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 %s@%s %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 */

diff --git a/ircd/s_user.c b/ircd/s_user.c
index f28d9af0213172d9548e132f2a0e7881cb3143d4..c2ff89a2bdb3b7276d291be039021429db2af378 100644 (file)
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -543,6 +543,7 @@ int register_user(struct Client *cptr, struct Client *sptr,
 
     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 @@ int register_user(struct Client *cptr, struct Client *sptr,
       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 (%s@%s) [%s] {%d}",
+                           "Client connecting: %s (%s@%s) [%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 @@ add_target(struct Client *sptr, void *target)
 
   targets = cli_targets(sptr);
 
-  if (IsChannelName(cli_name(sptr)) && IsInvited(sptr, target))
-    return;
   /* 
    * Already in table?
    */
@@ -881,6 +881,10 @@ int check_target_limit(struct Client *sptr, void *target, const char *name,
   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 @@ int set_user_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv
          do_host_hiding = 1;
        break;
       default:
+        send_reply(sptr, ERR_UMODEUNKNOWNFLAG, *m);
         break;
       }
     }