From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 20 Jun 2016 05:55:34 +0000 (+1000)
Subject: get_remote_name_or_ip inside LOGIN_NEEDS_UTMPX
X-Git-Tag: V_7_3_P1~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa37768f17d01974b6bfa481e5e83841b6c76f86;p=thirdparty%2Fopenssh-portable.git

get_remote_name_or_ip inside LOGIN_NEEDS_UTMPX

Apply the same get_remote_name_or_ip -> session_get_remote_name_or_ip
change as commit 95767262 to the code inside #ifdef LOGIN_NEEDS_UTMPX.
Fixes build on AIX.
---

diff --git a/session.c b/session.c
index 4653b09ff..2235f26ac 100644
--- a/session.c
+++ b/session.c
@@ -769,6 +769,7 @@ do_exec_pty(Session *s, const char *command)
 static void
 do_pre_login(Session *s)
 {
+	struct ssh *ssh = active_state;	/* XXX */
 	socklen_t fromlen;
 	struct sockaddr_storage from;
 	pid_t pid = getpid();
@@ -788,7 +789,7 @@ do_pre_login(Session *s)
 	}
 
 	record_utmp_only(pid, s->tty, s->pw->pw_name,
-	    get_remote_name_or_ip(utmp_len, options.use_dns),
+	    session_get_remote_name_or_ip(ssh, utmp_len, options.use_dns),
 	    (struct sockaddr *)&from, fromlen);
 }
 #endif