Module: ngircd.git Branch: master Commit: f79d41e92741fa2f6bc6fef957d278707ad4236a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f79d4...

Author: Alexander Barton alex@barton.de Date: Sun Aug 26 19:11:44 2012 +0200

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

---

src/ngircd/login.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ngircd/login.c b/src/ngircd/login.c index e1959d6..460fcd1 100644 --- a/src/ngircd/login.c +++ b/src/ngircd/login.c @@ -93,14 +93,14 @@ Login_User(CLIENT * Client) * the beahiour of the daemon compiled without PAM support: * because there can't be any "server password", all * 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); Client_Reject(Client, "Non-empty password", false); return DISCONNECTED; }

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- * authenticated at all. If not, they won't become "identified" * and keep the "~" in their supplied user name. @@ -130,7 +130,7 @@ Login_User(CLIENT * Client) } #else /* Check global server password ... */ - if (strcmp(Conn_Password(Client_Conn(Client)), Conf_ServerPwd) != 0) { + if (strcmp(Conn_Password(conn), Conf_ServerPwd) != 0) { /* Bad password! */ Client_Reject(Client, "Bad server password", false); return DISCONNECTED;