ircs[n]printf -> rb_s[n]printf

[solanum.git] / src / s_conf.c

diff --git a/src/s_conf.c b/src/s_conf.c
index eceec142fb1a6311a6a54afb0b3497a0a7ffb9f5..247ae6827d2afbc57e417b552aec56373f9b71fa 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -339,10 +339,6 @@ verify_access(struct Client *client_p, const char *username)
                        return (NOT_AUTHORISED);
                }
 
-
-               if(IsConfDoIdentd(aconf))
-                       SetNeedId(client_p);
-
                /* Thanks for spoof idea amm */
                if(IsConfDoSpoofIp(aconf))
                {
@@ -603,7 +599,6 @@ attach_conf(struct Client *client_p, struct ConfItem *aconf)
                else
                {
                        sendto_one_notice(client_p, ":*** I: line is full, but you have an >I: line!");
-                       SetExemptLimits(client_p);
                }
 
        }
@@ -797,7 +792,6 @@ set_default_conf(void)
        ConfigFileEntry.gline_min_cidr6 = 48;
        ConfigFileEntry.hide_spoof_ips = YES;
        ConfigFileEntry.hide_error_messages = 1;
-       ConfigFileEntry.idletime = 0;
        ConfigFileEntry.dots_in_ident = 0;
        ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
        DupString(ConfigFileEntry.servlink_path, SLPATH);
@@ -850,7 +844,7 @@ set_default_conf(void)
        ConfigFileEntry.reject_duration = 120;
        ConfigFileEntry.max_unknown_ip = 2;
 
-       ServerInfo.max_clients = comm_get_maxconnections() - MAX_BUFFER;
+       ServerInfo.max_clients = rb_get_maxconnections() - MAX_BUFFER;
 }
 
 #undef YES
@@ -898,8 +892,6 @@ validate_conf(void)
           (ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
                ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
 
-       GlobalSetOptions.idletime = (ConfigFileEntry.idletime * 60);
-
        if(!split_users || !split_servers ||
           (!ConfigChannel.no_create_on_split && !ConfigChannel.no_join_on_split))
        {
@@ -1090,13 +1082,13 @@ get_oper_name(struct Client *client_p)
 
        if(MyOper(client_p))
        {
-               ircsnprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
+               rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
                                client_p->name, client_p->username,
                                client_p->host, client_p->localClient->opername);
                return buffer;
        }
 
-       ircsnprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
+       rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
                   client_p->name, client_p->username, 
                   client_p->host, client_p->servptr->name);
        return buffer;
@@ -1387,20 +1379,20 @@ write_confitem(KlineType type, struct Client *source_p, char *user,
 
        if(type == KLINE_TYPE)
        {
-               ircsnprintf(buffer, sizeof(buffer),
+               rb_snprintf(buffer, sizeof(buffer),
                           "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n",
                           user, host, reason, oper_reason, current_date,
                           get_oper_name(source_p), CurrentTime);
        }
        else if(type == DLINE_TYPE)
        {
-               ircsnprintf(buffer, sizeof(buffer),
+               rb_snprintf(buffer, sizeof(buffer),
                           "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n", host,
                           reason, oper_reason, current_date, get_oper_name(source_p), CurrentTime);
        }
        else if(type == RESV_TYPE)
        {
-               ircsnprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n",
+               rb_snprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n",
                           host, reason, get_oper_name(source_p), CurrentTime);
        }