Automated branch merge.

This commit is contained in:
William Pitcock 2008-08-29 14:46:39 -05:00
commit 978daf7118
1 changed files with 15 additions and 5 deletions

View File

@ -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);