Look for REMOTE_HOST before SSH_* environment options.

diff --git a/clientname.c b/clientname.c
index d085fc786a70697e53c326c91183d31f944b9d1d..935d2d61f85c143aaf45d48431c531e066669020 100644 (file)
--- 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. */