Fix --remove-source-files sanity check w/--copy-links the right way.

[rsync.git] / clientname.c

diff --git a/clientname.c b/clientname.c
index d085fc786a70697e53c326c91183d31f944b9d1d..4ac8b485aa73f7fc5c5fa0096cfe45f73f192f1c 100644 (file)
--- a/clientname.c
+++ b/clientname.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1992-2001 Andrew Tridgell <tridge@samba.org>
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002-2013 Wayne Davison
+ * Copyright (C) 2002-2018 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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. */