Author: Kev <klmitch@mit.edu>

[ircu2.10.12-pk.git] / ircd / s_bsd.c

diff --git a/ircd/s_bsd.c b/ircd/s_bsd.c
index 949a02a868bffc3cf0136192a104cab1f86c3fb9..e66a9d97c3c2c201e13d1dd2aece12ebae731393 100644 (file)
--- a/ircd/s_bsd.c
+++ b/ircd/s_bsd.c
@@ -482,7 +482,7 @@ void close_connection(struct Client *cptr)
        * CONF_ILLEGAL). But only do this if it was a "good" link.
        */
       aconf->hold = CurrentTime;
-      aconf->hold += (aconf->hold - cptr->since > HANGONGOODLINK) ?
+      aconf->hold += (aconf->hold - cli_since(cptr) > HANGONGOODLINK) ?
                      HANGONRETRYDELAY : ConfConFreq(aconf);
       if (nextconnect > aconf->hold)
         nextconnect = aconf->hold;
@@ -698,7 +698,7 @@ static int read_packet(struct Client *cptr, int socket_ready)
        */
       if (0 == dolen) {
         if (DBufLength(&(cli_recvQ(cptr))) < 510)
-          cptr->flags |= FLAGS_NONL;
+          cli_flags(cptr) |= FLAGS_NONL;
         else
           DBufClear(&(cli_recvQ(cptr)));
       }
@@ -1399,8 +1399,8 @@ int connect_server(struct ConfItem* aconf, struct Client* by,
   if (by && IsUser(by)) {
     sprintf_irc(cli_serv(cptr)->by, "%s%s", NumNick(by));
     assert(0 == cli_serv(cptr)->user);
-    cli_serv(cptr)->user = by->user;
-    by->user->refcnt++;
+    cli_serv(cptr)->user = cli_user(by);
+    cli_user(by)->refcnt++;
   }
   else {
     *(cli_serv(cptr))->by = '\0';