strcpy: mass-migrate to strlcpy where appropriate

[solanum.git] / ircd / client.c

diff --git a/ircd/client.c b/ircd/client.c
index 00794a6f1b2b596b7fd547fb81ccb80a71e2cfb6..9ec5c6cc759414fa464462a10985daefab82e1a7 100644 (file)
--- a/ircd/client.c
+++ b/ircd/client.c
@@ -140,8 +140,8 @@ init_client(void)
 uint32_t
 connid_get(struct Client *client_p)
 {
-       s_assert(MyClient(client_p));
-       if (!MyClient(client_p))
+       s_assert(MyConnect(client_p));
+       if (!MyConnect(client_p))
                return 0;
 
        /* find a connid that is available */
@@ -194,8 +194,10 @@ client_release_connids(struct Client *client_p)
 {
        rb_dlink_node *ptr, *ptr2;
 
-       s_assert(MyClient(client_p));
-       if (!MyClient(client_p))
+       if (client_p->localClient->connids.head)
+               s_assert(MyConnect(client_p));
+
+       if (!MyConnect(client_p))
                return;
 
        RB_DLINK_FOREACH_SAFE(ptr, ptr2, client_p->localClient->connids.head)
@@ -245,7 +247,7 @@ make_client(struct Client *from)
        }
 
        SetUnknown(client_p);
-       strcpy(client_p->username, "unknown");
+       rb_strlcpy(client_p->username, "unknown", sizeof(client_p->username));
 
        return client_p;
 }
@@ -1079,7 +1081,7 @@ free_exited_clients(void *unused)
                                        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                                "On abort_list: %s stat: %u flags: %llu handler: %c",
                                                target_p->name, (unsigned int) target_p->status,
-                                               target_p->flags,  target_p->handler);
+                                               (unsigned long long)target_p->flags,  target_p->handler);
                                        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                                "Please report this to the charybdis developers!");
                                        found++;
@@ -1223,7 +1225,7 @@ exit_aborted_clients(void *unused)
                                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                        "On dead_list: %s stat: %u flags: %llu handler: %c",
                                        abt->client->name, (unsigned int) abt->client->status,
-                                       abt->client->flags, abt->client->handler);
+                                       (unsigned long long)abt->client->flags, abt->client->handler);
                                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                        "Please report this to the charybdis developers!");
                                continue;
@@ -1352,10 +1354,18 @@ exit_remote_client(struct Client *client_p, struct Client *source_p, struct Clie
  */
 
 static int
-exit_unknown_client(struct Client *client_p, struct Client *source_p, struct Client *from,
-                 const char *comment)
+exit_unknown_client(struct Client *client_p, /* The local client originating the
+                                              * exit or NULL, if this exit is
+                                              * generated by this server for
+                                              * internal reasons.
+                                              * This will not get any of the
+                                              * generated messages. */
+               struct Client *source_p,     /* Client exiting */
+               struct Client *from,         /* Client firing off this Exit,
+                                              * never NULL! */
+               const char *comment)
 {
-       authd_abort_client(client_p);
+       authd_abort_client(source_p);
        rb_dlinkDelete(&source_p->localClient->tnode, &unknown_list);
 
        if(!IsIOError(source_p))