Branch merge.

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

diff --git a/src/s_user.c b/src/s_user.c
index 9ff1e4053c6f6dc0fe7feace9dc3a74315b56561..774fdb3e50964392089ee0a065d3bfc1f8b4530a 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -39,7 +39,7 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "s_stats.h"
 #include "scache.h"
@@ -261,7 +261,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
        if(rb_dlink_list_length(&source_p->preClient->dnsbl_queries) > 0)
                return -1;
 
-       client_p->localClient->last = CurrentTime;
+       client_p->localClient->last = rb_current_time();
        /* Straight up the maximum rate of flooding... */
        source_p->localClient->allow_read = MAX_FLOOD_BURST;
 
@@ -290,10 +290,14 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
        /* Apply nick override */
        if(*source_p->preClient->spoofnick)
        {
+               char note[NICKLEN + 10];
+
                del_from_client_hash(source_p->name, source_p);
                strlcpy(source_p->name, source_p->preClient->spoofnick, NICKLEN + 1);
                add_to_client_hash(source_p->name, source_p);
-               rb_note(source_p->localClient->F->fd, "Nick: %s", source_p->name);
+
+               rb_snprintf(note, NICKLEN + 10, "Nick: %s", source_p->name);
+               rb_note(source_p->localClient->F, note);
        }
 
        if(!valid_hostname(source_p->host))
@@ -319,7 +323,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 
                if(IsNeedIdentd(aconf))
                {
-                       ServerStats->is_ref++;
+                       ServerStats.is_ref++;
                        sendto_one_notice(source_p, ":*** Notice -- You need to install identd to use this server");
                        exit_client(client_p, source_p, &me, "Install identd");
                        return (CLIENT_EXITED);
@@ -346,7 +350,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 
        if(IsNeedSasl(aconf) && !*user->suser)
        {
-               ServerStats->is_ref++;
+               ServerStats.is_ref++;
                sendto_one_notice(source_p, ":*** Notice -- You need to identify via SASL to use this server");
                exit_client(client_p, source_p, &me, "SASL access only");
                return (CLIENT_EXITED);
@@ -366,7 +370,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 
                if(strcmp(encr, aconf->passwd))
                {
-                       ServerStats->is_ref++;
+                       ServerStats.is_ref++;
                        sendto_one(source_p, form_str(ERR_PASSWDMISMATCH), me.name, source_p->name);
                        exit_client(client_p, source_p, &me, "Bad Password");
                        return (CLIENT_EXITED);
@@ -400,7 +404,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                sendto_realops_snomask(SNO_FULL, L_ALL,
                                     "Too many clients, rejecting %s[%s].", source_p->name, source_p->host);
 
-               ServerStats->is_ref++;
+               ServerStats.is_ref++;
                exit_client(client_p, source_p, &me, "Sorry, server is full - try later");
                return (CLIENT_EXITED);
        }
@@ -409,7 +413,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
        if(!IsExemptKline(source_p) &&
           (xconf = find_xline(source_p->info, 1)) != NULL)
        {
-               ServerStats->is_ref++;
+               ServerStats.is_ref++;
                add_reject(source_p, xconf->name, NULL);
                exit_client(client_p, source_p, &me, "Bad user info");
                return CLIENT_EXITED;
@@ -431,7 +435,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                        substitution_append_var(&varlist, "dnsbl-host", source_p->preClient->dnsbl_listed->host);
                        substitution_append_var(&varlist, "network-name", ServerInfo.network_name);
 
-                       ServerStats->is_ref++;
+                       ServerStats.is_ref++;
 
                        sendto_one(source_p, form_str(ERR_YOUREBANNEDCREEP),
                                        me.name, source_p->name,
@@ -455,7 +459,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                sendto_realops_snomask(SNO_REJ, L_ALL,
                                     "Invalid username: %s (%s@%s)",
                                     source_p->name, source_p->username, source_p->host);
-               ServerStats->is_ref++;
+               ServerStats.is_ref++;
                sendto_one_notice(source_p, ":*** Your username is invalid. Please make sure that your username contains "
                                            "only alphanumeric characters.");
                rb_sprintf(tmpstr2, "Invalid username [%s]", source_p->username);