]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
get_remote_name_or_ip inside LOGIN_NEEDS_UTMPX
authorDarren Tucker <dtucker@zip.com.au>
Mon, 20 Jun 2016 05:55:34 +0000 (15:55 +1000)
committerDarren Tucker <dtucker@zip.com.au>
Mon, 20 Jun 2016 05:55:34 +0000 (15:55 +1000)
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.

session.c

index 4653b09ff8174dc6ad6d4020dc67d809e8c097ec..2235f26acb7867b793132272f8bf651e22c37664 100644 (file)
--- 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