Fix includes.

[solanum.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 07941dcdd5df691f5b88ee8e869fb216f58870e8..31e05c109fc50a53adcda7166a031a65be907d89 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];
@@ -415,10 +415,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 +450,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;
                }
@@ -637,7 +637,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
                              nick, source_p->hopcount + 1,
                              (long) source_p->tsinfo,
                              ubuf, source_p->username, source_p->host,
-                             user->server, source_p->info);
+                             source_p->servptr->name, source_p->info);
        }
        else
                sendto_server(client_p, NULL, NOCAPS, NOCAPS,
@@ -645,7 +645,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
                              nick, source_p->hopcount + 1,
                              (long) source_p->tsinfo,
                              ubuf, source_p->username, source_p->host,
-                             user->server, source_p->info);
+                             source_p->servptr->name, source_p->info);
 
        if (IsDynSpoof(source_p))
        {