Fix expire_check(), do_login() and do_logout() for multiuser.

Fix the make_hostmask() fiasco dKingston inflicted on us.

help/logout

@@ -1,16 +1,15 @@
 Help for LOGOUT:
 
 LOGOUT logs you out of services so that you
-can log into another username or whatever else
-melts your butter. Note that you are automatically
-logged out when you sign off.
+can log into another username, etc. Note that
+you are automatically logged out when you sign off.
 
-If the last two parameters are present it will
-logout whomever is currently logged in as the
-supplied username.
+If the last parameter is present it will log out the
+indicated nickname from the username you're currently
+logged in as.
 
-Syntax: LOGOUT [username] [password]
+Syntax: LOGOUT [nickname]
 
 Examples:
     /msg &nick& LOGOUT
-    /msg &nick& LOGOUT foo bar
+    /msg &nick& LOGOUT foo

inc/extern.h

@@ -82,7 +82,6 @@ E void *scalloc(size_t elsize, size_t els);
 E void *srealloc(void *oldptr, size_t newsize);
 E char *sstrdup(const char *s);
 E void strip(char *line);
-E char *make_hostmask(char *nick, char *user, char *host);
 E void slog(uint32_t level, const char *fmt, ...);
 E uint32_t time_msec(void);
 E uint8_t regex_match(regex_t * preg, char *pattern, char *string,

src/cmode.c

@@ -189,8 +189,10 @@ void channel_mode(channel_t *chan, uint8_t parc, char *parv[])
 
             if ((MC_SECURE & mc->flags) && (status_mode_list[i].mode == 'o'))
             {
-              char *hostbuf = make_hostmask(cu->user->nick, cu->user->user,
-                                            cu->user->host);
+              char hostbuf[BUFSIZE];
+
+              snprintf(hostbuf, BUFSIZE, "%s!%s@%s",
+                cu->user->nick, cu->user->user, cu->user->host);
 
               if ((!is_founder(mc, mu)) && (cu->user != svs.svs) &&
                   (!is_xop(mc, mu, (CA_AOP | CA_SOP))) &&

src/function.c

@@ -177,21 +177,6 @@ void strip(char *line)
   }
 }
 
-/* creates a hostmask based on params */
-char *make_hostmask(char *nick, char *user, char *host)
-{
-    static char buf[BUFSIZE];
-    buf[0] = '\0';
-
-    strlcat(buf, nick, BUFSIZE);
-    strlcat(buf, "!", BUFSIZE);
-    strlcat(buf, user, BUFSIZE);
-    strlcat(buf, "@", BUFSIZE);
-    strlcat(buf, host, BUFSIZE);
-
-    return buf;
-}
-
 /* logs something to shrike.log */
 void slog(uint32_t level, const char *fmt, ...)
 {
@@ -682,13 +667,13 @@ boolean_t is_successor(mychan_t *mychan, myuser_t *myuser)
 
 boolean_t is_xop(mychan_t *mychan, myuser_t *myuser, uint8_t level)
 {
-  char *hostbuf;
+  char hostbuf[BUFSIZE];
 
   if (!myuser)
     return FALSE;
 
-  hostbuf = make_hostmask(myuser->user->nick, myuser->user->user,
-                          myuser->user->host);
+  snprintf(hostbuf, BUFSIZE, "%s!%s@%s",
+    myuser->user->nick, myuser->user->user, myuser->user->host);
 
   if (chanacs_find(mychan, myuser, level))
     return TRUE;
@@ -736,7 +721,9 @@ boolean_t should_op(mychan_t *mychan, myuser_t *myuser)
 
 boolean_t should_op_host(mychan_t *mychan, char *host)
 {
-  char *hostbuf = make_hostmask(svs.nick, svs.user, svs.host);
+  char hostbuf[BUFSIZE];
+
+  snprintf(hostbuf, BUFSIZE, "%s!%s@%s", svs.nick, svs.user, svs.host);
 
   if (!match(host, hostbuf))
     return FALSE;
@@ -772,7 +759,9 @@ boolean_t should_voice(mychan_t *mychan, myuser_t *myuser)
 
 boolean_t should_voice_host(mychan_t *mychan, char *host)
 {
-  char *hostbuf = make_hostmask(svs.nick, svs.user, svs.host);
+  char hostbuf[BUFSIZE];
+
+  snprintf(hostbuf, BUFSIZE, "%s!%s@%s", svs.nick, svs.user, svs.host);
 
   if (!match(host, hostbuf))
     return FALSE;

src/node.c

@@ -768,7 +768,7 @@ chanuser_t *chanuser_add(channel_t *chan, char *nick)
   chanuser_t *cu, *tcu;
   mychan_t *mc;
   uint32_t flags = 0;
-  char *hostbuf;
+  char hostbuf[BUFSIZE];
 
   if (*chan->name != '#')
   {
@@ -794,7 +794,7 @@ chanuser_t *chanuser_add(channel_t *chan, char *nick)
         return NULL;
       }
 
-      hostbuf = make_hostmask(u->nick, u->user, u->host);
+      snprintf(hostbuf, BUFSIZE, "%s!%s@%s", u->nick, u->user, u->host);
 
       /* see if we need to deop them */
       if ((mc = mychan_find(chan->name)))
@@ -888,16 +888,9 @@ chanuser_t *chanuser_add(channel_t *chan, char *nick)
 
   if (mc)
   {
-    /* XXX - for some reason make_hostmask doesn't work here */
     char newhostbuf[BUFSIZE];
 
-    newhostbuf[0] = '\0';
-
-    strlcat(newhostbuf, u->nick, BUFSIZE);
-    strlcat(newhostbuf, "!", BUFSIZE);
-    strlcat(newhostbuf, u->user, BUFSIZE);
-    strlcat(newhostbuf, "@", BUFSIZE);
-    strlcat(newhostbuf, u->host, BUFSIZE);
+    snprintf(newhostbuf, BUFSIZE, "%s!%s@%s", u->nick, u->user, u->host);
 
     if (should_voice_host(mc, newhostbuf))
     {