1
0
mirror of https://github.com/osmarks/ngircd.git synced 2024-10-28 12:56:18 +00:00

Login_User(): use "conn" insted of calling Client_Conn(Client)

This commit is contained in:
Alexander Barton 2012-08-26 19:11:44 +02:00
parent 1680ea02da
commit f79d41e927

View File

@ -93,14 +93,14 @@ Login_User(CLIENT * Client)
* the beahiour of the daemon compiled without PAM support: * the beahiour of the daemon compiled without PAM support:
* because there can't be any "server password", all * because there can't be any "server password", all
* passwords supplied are classified as "wrong". */ * passwords supplied are classified as "wrong". */
if(Conn_Password(Client_Conn(Client))[0] == '\0') if(Conn_Password(conn)[0] == '\0')
return Login_User_PostAuth(Client); return Login_User_PostAuth(Client);
Client_Reject(Client, "Non-empty password", false); Client_Reject(Client, "Non-empty password", false);
return DISCONNECTED; return DISCONNECTED;
} }
if (Conf_PAMIsOptional && if (Conf_PAMIsOptional &&
strcmp(Conn_Password(Client_Conn(Client)), "") == 0) { strcmp(Conn_Password(conn), "") == 0) {
/* Clients are not required to send a password and to be PAM- /* Clients are not required to send a password and to be PAM-
* authenticated at all. If not, they won't become "identified" * authenticated at all. If not, they won't become "identified"
* and keep the "~" in their supplied user name. * and keep the "~" in their supplied user name.
@ -130,7 +130,7 @@ Login_User(CLIENT * Client)
} }
#else #else
/* Check global server password ... */ /* Check global server password ... */
if (strcmp(Conn_Password(Client_Conn(Client)), Conf_ServerPwd) != 0) { if (strcmp(Conn_Password(conn), Conf_ServerPwd) != 0) {
/* Bad password! */ /* Bad password! */
Client_Reject(Client, "Bad server password", false); Client_Reject(Client, "Bad server password", false);
return DISCONNECTED; return DISCONNECTED;