}
else
{
- whowas_set* grp = (whowas_set*)i;
+ whowas_set* grp = i->second;
if (grp->size())
{
- for (whowas_set::iterator u = grp->begin(); u != grp->end(); u++)
+ for (whowas_set::iterator ux = grp->begin(); ux != grp->end(); ux++)
{
+ WhoWasGroup* u = *ux;
time_t rawtime = u->signon;
tm *timeinfo;
char b[MAXBUF];
timeinfo = localtime(&rawtime);
+
+ /* XXX - 'b' could be only 25 chars long and then strlcpy() would terminate it for us too? */
strlcpy(b,asctime(timeinfo),MAXBUF);
b[24] = 0;
WriteServ(user->fd,"314 %s %s %s %s * :%s",user->nick,parameters[0],u->ident,u->dhost,u->gecos);
- WriteServ(user->fd,"312 %s %s %s :%s",user->nick,parameters[0], *Config->HideWhoisServer ? Config->HideWhoisServer : u->server,b);
- WriteServ(user->fd,"369 %s %s :End of WHOWAS",user->nick,parameters[0]);
+
+ if(*user->oper)
+ WriteServ(user->fd,"379 %s %s :was connecting from *@%s", user->nick, parameters[0], u->host);
+
+ if(*Config->HideWhoisServer && !(*user->oper))
+ WriteServ(user->fd,"312 %s %s %s :%s",user->nick,parameters[0], Config->HideWhoisServer, b);
+ else
+ WriteServ(user->fd,"312 %s %s %s :%s",user->nick,parameters[0], u->server, b);
}
}
else
WriteServ(user->fd,"406 %s %s :There was no such nickname",user->nick,parameters[0]);
}
}
+
WriteServ(user->fd,"369 %s %s :End of WHOWAS",user->nick,parameters[0]);
}
-