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 161cacc06ce1f37ef032a9ec8f78f717c903f44f..a163a1a53d92e0ef3c8faffb54b853af40e505a2 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -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))