Remove various obsolete ConfItem statuses (types) and flags.

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

diff --git a/src/s_conf.c b/src/s_conf.c
index 20b641b3c32fde8166b5a155701cab24c62c8e4f..22575fe083d979883f20104851c02171119bd8b7 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);
        }
 
@@ -1225,7 +1220,6 @@ clear_out_old_conf(void)
        struct Class *cltmp;
        dlink_node *ptr;
        dlink_node *next_ptr;
-       int i;
 
        /*
         * don't delete the class table, rather mark all entries