From 99c9520ea735d3fa72721c534a5e3b25751e0203 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 12 Jul 2013 15:24:58 -0700 Subject: [PATCH] Look for REMOTE_HOST before SSH_* environment options. --- clientname.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clientname.c b/clientname.c index d085fc78..935d2d61 100644 --- a/clientname.c +++ b/clientname.c @@ -50,10 +50,10 @@ char *client_addr(int fd) if (am_server) { /* daemon over --rsh mode */ char *env_str; strlcpy(addr_buf, "0.0.0.0", sizeof addr_buf); - if ((env_str = getenv("SSH_CONNECTION")) != NULL + if ((env_str = getenv("REMOTE_HOST")) != NULL + || (env_str = getenv("SSH_CONNECTION")) != NULL || (env_str = getenv("SSH_CLIENT")) != NULL - || (env_str = getenv("SSH2_CLIENT")) != NULL - || (env_str = getenv("REMOTE_HOST")) != NULL) { + || (env_str = getenv("SSH2_CLIENT")) != NULL) { char *p; strlcpy(addr_buf, env_str, sizeof addr_buf); /* Truncate the value to just the IP address. */ -- 2.47.2