Automated merge with ssh://hg.atheme.org//hg/charybdis
This commit is contained in:
commit
9ac19244c0
|
@ -83,9 +83,9 @@ mr_pass(struct Client *client_p, struct Client *source_p, int parc, const char *
|
||||||
auth_user = NULL;
|
auth_user = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
client_p->localClient->passwd = rb_strndup(pass, PASSWDLEN);
|
client_p->localClient->passwd = *pass ? rb_strndup(pass, PASSWDLEN) : NULL;
|
||||||
|
|
||||||
if(auth_user)
|
if(auth_user && *auth_user)
|
||||||
client_p->localClient->auth_user = rb_strndup(auth_user, PASSWDLEN);
|
client_p->localClient->auth_user = rb_strndup(auth_user, PASSWDLEN);
|
||||||
|
|
||||||
/* These are for servers only */
|
/* These are for servers only */
|
||||||
|
|
20
src/s_user.c
20
src/s_user.c
|
@ -649,11 +649,21 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
|
||||||
else
|
else
|
||||||
identifyservice_p = NULL;
|
identifyservice_p = NULL;
|
||||||
if (identifyservice_p != NULL)
|
if (identifyservice_p != NULL)
|
||||||
sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s",
|
{
|
||||||
get_id(source_p, identifyservice_p),
|
if (!EmptyString(source_p->localClient->auth_user))
|
||||||
ConfigFileEntry.identifyservice,
|
sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s %s",
|
||||||
ConfigFileEntry.identifycommand,
|
get_id(source_p, identifyservice_p),
|
||||||
source_p->localClient->passwd);
|
ConfigFileEntry.identifyservice,
|
||||||
|
ConfigFileEntry.identifycommand,
|
||||||
|
source_p->localClient->auth_user,
|
||||||
|
source_p->localClient->passwd);
|
||||||
|
else
|
||||||
|
sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s",
|
||||||
|
get_id(source_p, identifyservice_p),
|
||||||
|
ConfigFileEntry.identifyservice,
|
||||||
|
ConfigFileEntry.identifycommand,
|
||||||
|
source_p->localClient->passwd);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
memset(source_p->localClient->passwd, 0, strlen(source_p->localClient->passwd));
|
memset(source_p->localClient->passwd, 0, strlen(source_p->localClient->passwd));
|
||||||
rb_free(source_p->localClient->passwd);
|
rb_free(source_p->localClient->passwd);
|
||||||
|
|
Loading…
Reference in New Issue