[svn] Fix description of 043 numeric.

[irc/rqf/shadowircd.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index f4ff4b06bd50ff1eb9f5de4ebf1c5878790a34d5..91f30dd83c8d4786b840589f77097f75b20b73d9 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_user.c 3293 2007-03-28 14:33:50Z jilles $
+ *  $Id: s_user.c 3414 2007-04-15 16:54:50Z jilles $
  */
 
 #include "stdinc.h"
@@ -402,10 +402,8 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
         *   -Taner
         */
        /* Except "F:" clients */
-       if(((dlink_list_length(&lclient_list) + 1) >= 
-          ((unsigned long)GlobalSetOptions.maxclients + MAX_BUFFER) ||
-           (dlink_list_length(&lclient_list) + 1) >= 
-           ((unsigned long)GlobalSetOptions.maxclients - 5)) && !(IsExemptLimits(source_p)))
+       if(dlink_list_length(&lclient_list) >=
+           (unsigned long)GlobalSetOptions.maxclients && !IsExemptLimits(source_p))
        {
                sendto_realops_snomask(SNO_FULL, L_ALL,
                                     "Too many clients, rejecting %s[%s].", source_p->name, source_p->host);
@@ -486,9 +484,18 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                        SetDynSpoof(source_p);
        }
 
-       if(IsAnyDead(client_p))
+       source_p->umodes |= ConfigFileEntry.default_umodes & ~ConfigFileEntry.oper_only_umodes & ~orphaned_umodes;
+
+       call_hook(h_new_local_user, source_p);
+
+       /* If they have died in send_* or were thrown out by the
+        * new_local_user hook don't do anything. */
+       if(IsAnyDead(source_p))
                return CLIENT_EXITED;
 
+       /* To avoid inconsistencies, do not abort the registration
+        * starting from this point -- jilles
+        */
        inetntop_sock((struct sockaddr *)&source_p->localClient->ip, ipaddr, sizeof(ipaddr));
 
        sendto_realops_snomask(SNO_CCONN, L_ALL,
@@ -506,10 +513,6 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                        show_ip(NULL, source_p) ? source_p->localClient->fullcaps : "<hidden> <hidden>",
                        source_p->info);
 
-       /* If they have died in send_* don't do anything. */
-       if(IsAnyDead(source_p))
-               return CLIENT_EXITED;
-
        add_to_hostname_hash(source_p->orighost, source_p);
 
        /* Allocate a UID if it was not previously allocated.
@@ -521,8 +524,6 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                add_to_id_hash(source_p->id, source_p);
        }
 
-       source_p->umodes |= ConfigFileEntry.default_umodes & ~ConfigFileEntry.oper_only_umodes & ~orphaned_umodes;
-
        if (source_p->umodes & UMODE_INVISIBLE)
                Count.invisi++;
 
@@ -554,8 +555,6 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
        if(find_tgchange(source_p->sockhost))
                USED_TARGETS(source_p) = 6;
 
-       call_hook(h_new_local_user, source_p);
-
        monitor_signon(source_p);
        user_welcome(source_p);
 
@@ -941,10 +940,12 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
                                *m++ = (char) i;
 
                *m = '\0';
-               sendto_one(source_p, form_str(RPL_UMODEIS), me.name, source_p->name, buf);
+               sendto_one_numeric(source_p, RPL_UMODEIS, form_str(RPL_UMODEIS), buf);
+
                if (source_p->snomask != 0)
-                       sendto_one(source_p, form_str(RPL_SNOMASK), me.name, source_p->name,
+                       sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),
                                construct_snobuf(source_p->snomask));
+
                return 0;
        }
 
@@ -1117,7 +1118,7 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
         */
        send_umode_out(client_p, source_p, setflags);
        if (showsnomask && MyConnect(source_p))
-               sendto_one(source_p, form_str(RPL_SNOMASK), me.name, source_p->name,
+               sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),
                        construct_snobuf(source_p->snomask));
 
        return (0);
@@ -1217,14 +1218,11 @@ send_umode_out(struct Client *client_p, struct Client *source_p, int old)
 void
 user_welcome(struct Client *source_p)
 {
-       sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
-                  ServerInfo.network_name, source_p->name);
-       sendto_one(source_p, form_str(RPL_YOURHOST), me.name,
-                  source_p->name,
+       sendto_one_numeric(source_p, RPL_WELCOME, form_str(RPL_WELCOME), ServerInfo.network_name, source_p->name);
+       sendto_one_numeric(source_p, RPL_YOURHOST, form_str(RPL_YOURHOST),
                   get_listener_name(source_p->localClient->listener), ircd_version);
-
-       sendto_one(source_p, form_str(RPL_CREATED), me.name, source_p->name, creation);
-       sendto_one(source_p, form_str(RPL_MYINFO), me.name, source_p->name, me.name, ircd_version, umodebuf);
+       sendto_one_numeric(source_p, RPL_CREATED, form_str(RPL_CREATED), creation);
+       sendto_one_numeric(source_p, RPL_MYINFO, form_str(RPL_MYINFO), me.name, ircd_version, umodebuf);
 
        show_isupport(source_p);
 
@@ -1312,7 +1310,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
        if((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
                --Count.invisi;
        send_umode_out(source_p, source_p, old);
-       sendto_one(source_p, form_str(RPL_SNOMASK), me.name, source_p->name,
+       sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),
                   construct_snobuf(source_p->snomask));
        sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
        sendto_one_notice(source_p, ":*** Oper privs are %s", get_oper_privs(oper_p->flags));