#include "stdinc.h"
#include "client.h"
-#include "irc_string.h"
+#include "match.h"
#include "ircd.h"
#include "numeric.h"
#include "s_user.h"
#include "msg.h"
#include "parse.h"
#include "modules.h"
-#include "sprintf_irc.h"
#include "blacklist.h"
+#include "s_assert.h"
static int mr_user(struct Client *, struct Client *, int, const char **);
return 0;
}
+ if(source_p->flags & FLAGS_SENTUSER)
+ return 0;
+
if((p = strchr(parv[1], '@')))
*p = '\0';
rb_snprintf(buf, sizeof(buf), "%s %s", parv[2], parv[3]);
- MyFree(source_p->localClient->fullcaps);
- DupString(source_p->localClient->fullcaps, buf);
+ rb_free(source_p->localClient->fullcaps);
+ source_p->localClient->fullcaps = rb_strdup(buf);
do_local_user(client_p, source_p, parv[1], parv[4]);
return 0;
do_local_user(struct Client *client_p, struct Client *source_p,
const char *username, const char *realname)
{
- struct User *user;
-
s_assert(NULL != source_p);
s_assert(source_p->username != username);
- user = make_user(source_p);
+ make_user(source_p);
- if (!(source_p->flags & FLAGS_SENTUSER))
- {
- lookup_blacklists(source_p);
- source_p->flags |= FLAGS_SENTUSER;
- }
+ lookup_blacklists(source_p);
+ source_p->flags |= FLAGS_SENTUSER;
- strlcpy(source_p->info, realname, sizeof(source_p->info));
+ rb_strlcpy(source_p->info, realname, sizeof(source_p->info));
if(!IsGotId(source_p))
- {
- /* This is in this location for a reason..If there is no identd
- * and ping cookies are enabled..we need to have a copy of this
- */
- strlcpy(source_p->username, username, sizeof(source_p->username));
- }
+ rb_strlcpy(source_p->username, username, sizeof(source_p->username));
if(source_p->name[0])
{
/* NICK already received, now I have USER... */
- return register_local_user(client_p, source_p, username);
+ return register_local_user(client_p, source_p);
}
return 0;