Login_User(): use "conn" insted of calling Client_Conn(Client) move-connection-password
authorAlexander Barton <alex@barton.de>
Sun, 26 Aug 2012 17:11:44 +0000 (19:11 +0200)
committerAlexander Barton <alex@barton.de>
Sun, 26 Aug 2012 17:11:44 +0000 (19:11 +0200)
src/ngircd/login.c

index e1959d6662adefe11ef91ba351698203bbfcde63..460fcd1e4c1954e80d946d6ac1a08a0ba9e7722e 100644 (file)
@@ -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;