c0d7cc4bb8
- Prepend current directory when path is just filename (bsc#1095942) - Integration of MSI authentication for azurearm - Adds fix for SUSE Expanded Support os grain detection - Fixes 509x remote signing - Fix for StringIO import in Python2 - Use Adler32 algorithm to compute string checksums (bsc#1102819) - Only do reverse DNS lookup on IPs for salt-ssh (bsc#1104154) - Add support for Python 3.7 - Fix license macro to build on SLE12SP2 - Decode file contents for python2 (bsc#1102013) - Fix for sorting of multi-version packages (bsc#1097174 and bsc#1097413) - Fix mine.get not returning data - workaround for #48020 (bsc#1100142) - Added: * change-stringio-import-in-python2-to-import-the-clas.patch * integration-of-msi-authentication-with-azurearm-clou.patch * x509-fixes-for-remote-signing-106.patch * fix-for-suse-expanded-support-detection.patch * only-do-reverse-dns-lookup-on-ips-for-salt-ssh.patch * prepend-current-directory-when-path-is-just-filename.patch * add-support-for-python-3.7.patch * decode-file-contents-for-python2-bsc-1102013.patch * fix-mine.get-not-returning-data-workaround-for-48020.patch * x509-fixes-111.patch * use-adler32-algorithm-to-compute-string-checksums.patch - Modified: * fix-for-sorting-of-multi-version-packages-bsc-109717.patch OBS-URL: https://build.opensuse.org/request/show/636187 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=129
30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
From f346e83f6d4651a1cdcaad8c995642b55f66ddbc Mon Sep 17 00:00:00 2001
|
|
From: Daniel Wallace <danielwallace@gtmanfred.com>
|
|
Date: Wed, 25 Jul 2018 09:48:29 -0500
|
|
Subject: [PATCH] only do reverse dns lookup on ips for salt-ssh
|
|
|
|
Fixes #48676
|
|
---
|
|
salt/client/ssh/__init__.py | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/salt/client/ssh/__init__.py b/salt/client/ssh/__init__.py
|
|
index 8a85cc2480..d6ff0c3479 100644
|
|
--- a/salt/client/ssh/__init__.py
|
|
+++ b/salt/client/ssh/__init__.py
|
|
@@ -349,7 +349,9 @@ class SSH(object):
|
|
return
|
|
|
|
hostname = self.opts['tgt'].split('@')[-1]
|
|
- needs_expansion = '*' not in hostname and salt.utils.network.is_reachable_host(hostname)
|
|
+ needs_expansion = '*' not in hostname and \
|
|
+ salt.utils.network.is_reachable_host(hostname) and \
|
|
+ salt.utils.network.is_ip(hostname)
|
|
if needs_expansion:
|
|
hostname = salt.utils.network.ip_to_host(hostname)
|
|
if hostname is None:
|
|
--
|
|
2.17.1
|
|
|
|
|