Remove silly a2client_p, entirely pointless since User.server removal.

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

diff --git a/src/s_conf.c b/src/s_conf.c
index 15912c9f5e9b896a6db523aaf8f2763a5c53d594..1d6abd031183685b3015a3544b6673a96ed00862 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -173,8 +173,6 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 {
        int i;
 
-       ClearAccess(source_p);
-
        if((i = verify_access(source_p, username)))
        {
                ilog(L_FUSER, "Access denied: %s[%s]", 
@@ -281,13 +279,12 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
                                source_p->name, IsGotId(source_p) ? "" : "~",
                                source_p->username, source_p->sockhost,
                                source_p->localClient->listener->name, port);
-                       add_reject(client_p);
+                       add_reject(client_p, NULL, NULL);
                        exit_client(client_p, source_p, &me,
                                    "You are not authorised to use this server");
                        break;
                }
        case BANNED_CLIENT:
-               add_reject(client_p);
                exit_client(client_p, client_p, &me, "*** Banned ");
                ServerStats->is_ref++;
                break;
@@ -342,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))
                {
@@ -388,6 +381,7 @@ verify_access(struct Client *client_p, const char *username)
                                        form_str(ERR_YOUREBANNEDCREEP),
                                        me.name, client_p->name, aconf->passwd);
                }
+               add_reject(client_p, aconf->user, aconf->host);
                return (BANNED_CLIENT);
        }
        else if(aconf->status & CONF_GLINE)
@@ -399,6 +393,7 @@ verify_access(struct Client *client_p, const char *username)
                                        form_str(ERR_YOUREBANNEDCREEP),
                                        me.name, client_p->name, aconf->passwd);
 
+               add_reject(client_p, aconf->user, aconf->host);
                return (BANNED_CLIENT);
        }
 
@@ -604,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);
                }
 
        }
@@ -798,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);
@@ -899,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))
        {