From: Alexander Barton <alex@barton.de>
Date: Sun, 26 Aug 2012 17:11:44 +0000 (+0200)
Subject: Login_User(): use "conn" insted of calling Client_Conn(Client)
X-Git-Tag: rel-20-rc1~104^2
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=f79d41e92741fa2f6bc6fef957d278707ad4236a

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

diff --git a/src/ngircd/login.c b/src/ngircd/login.c
index e1959d66..460fcd1e 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;