d0e1a8d380
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=190
33 lines
1006 B
Diff
33 lines
1006 B
Diff
From 3beb3379dafe1adf9c1a43694f7b71938be3f583 Mon Sep 17 00:00:00 2001
|
|
From: Jochen Breuer <jbreuer@suse.de>
|
|
Date: Wed, 1 Apr 2020 16:13:23 +0200
|
|
Subject: [PATCH] Adds explicit type cast for port
|
|
|
|
If a port was passed as a string, the execution logic was broken
|
|
and a wrong set of remotes was returned.
|
|
|
|
The type casting to int solves this issue.
|
|
---
|
|
salt/utils/network.py | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/salt/utils/network.py b/salt/utils/network.py
|
|
index 5fc9a34ca4..0dd20c5599 100644
|
|
--- a/salt/utils/network.py
|
|
+++ b/salt/utils/network.py
|
|
@@ -1703,6 +1703,10 @@ def _netlink_tool_remote_on(port, which_end):
|
|
chunks = line.split()
|
|
remote_host, remote_port = chunks[4].rsplit(":", 1)
|
|
|
|
+ if which_end == "remote_port" and int(remote_port) != int(port):
|
|
+ continue
|
|
+ if which_end == "local_port" and int(local_port) != int(port):
|
|
+ continue
|
|
remotes.add(remote_host.strip("[]"))
|
|
|
|
if valid is False:
|
|
--
|
|
2.33.0
|
|
|
|
|