Remove various obsolete ConfItem statuses (types) and flags.

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

diff --git a/src/s_user.c b/src/s_user.c
index ef413d514b5b2bbd4d8256322388b5bdda4203b6..a163a1a53d92e0ef3c8faffb54b853af40e505a2 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -223,7 +223,7 @@ show_lusers(struct Client *source_p)
 int
 register_local_user(struct Client *client_p, struct Client *source_p, const char *username)
 {
-       struct ConfItem *aconf;
+       struct ConfItem *aconf, *xconf;
        struct User *user = source_p->user;
        char tmpstr2[IRCD_BUFSIZE];
        char ipaddr[HOSTIPLEN];
@@ -250,14 +250,14 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                        source_p->flags |= FLAGS_PINGSENT;
                        return -1;
                }
-               if(!(source_p->flags2 & FLAGS2_PING_COOKIE))
+               if(!(source_p->flags & FLAGS_PING_COOKIE))
                {
                        return -1;
                }
        }
 
        /* hasnt finished client cap negotiation */
-       if(source_p->flags2 & FLAGS2_CLICAP)
+       if(source_p->flags & FLAGS_CLICAP)
                return -1;
 
        /* still has DNSbls to validate against */
@@ -296,7 +296,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                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);
-               comm_note(source_p->localClient->fd, "Nick: %s", source_p->name);
+               comm_note(source_p->localClient->F->fd, "Nick: %s", source_p->name);
        }
 
        if(!valid_hostname(source_p->host))
@@ -304,11 +304,6 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                sendto_one_notice(source_p, ":*** Notice -- You have an illegal character in your hostname");
 
                strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
-
-#ifdef IPV6
-               if(ConfigFileEntry.dot_in_ip6_addr == 1)
-                       strlcat(source_p->host, ".", sizeof(source_p->host));
-#endif
        }
  
 
@@ -415,10 +410,10 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 
        /* kline exemption extends to xline too */
        if(!IsExemptKline(source_p) &&
-          find_xline(source_p->info, 1) != NULL)
+          (xconf = find_xline(source_p->info, 1)) != NULL)
        {
                ServerStats->is_ref++;
-               add_reject(source_p);
+               add_reject(source_p, xconf->name, NULL);
                exit_client(client_p, source_p, &me, "Bad user info");
                return CLIENT_EXITED;
        }
@@ -450,7 +445,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                        sendto_one_notice(source_p, ":*** Your IP address %s is listed in %s",
                                        source_p->sockhost, source_p->preClient->dnsbl_listed->host);
                        source_p->preClient->dnsbl_listed->hits++;
-                       add_reject(source_p);
+                       add_reject(source_p, NULL, NULL);
                        exit_client(client_p, source_p, &me, "*** Banned (DNS blacklist)");
                        return CLIENT_EXITED;
                }