|
 |
bffc8a |
From 086c1c5ca52b0ed8b810ad5a293a574ba990e635 Mon Sep 17 00:00:00 2001
|
|
|
bffc8a |
From: Pavel Moravec <pmoravec@redhat.com>
|
|
|
bffc8a |
Date: Tue, 13 Oct 2020 20:14:35 +0200
|
|
|
bffc8a |
Subject: [PATCH] [cleaner] more streamlined sanitize_item method
|
|
|
bffc8a |
|
|
|
bffc8a |
Remove a duplicate call in both IF branches.
|
|
|
bffc8a |
|
|
|
bffc8a |
Resolves: #2272
|
|
|
bffc8a |
|
|
|
bffc8a |
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
|
|
bffc8a |
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
bffc8a |
---
|
|
|
bffc8a |
sos/cleaner/mappings/ip_map.py | 3 +--
|
|
|
bffc8a |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
bffc8a |
|
|
|
bffc8a |
diff --git a/sos/cleaner/mappings/ip_map.py b/sos/cleaner/mappings/ip_map.py
|
|
|
bffc8a |
index 45fd9739..e6dffd60 100644
|
|
|
bffc8a |
--- a/sos/cleaner/mappings/ip_map.py
|
|
|
bffc8a |
+++ b/sos/cleaner/mappings/ip_map.py
|
|
|
bffc8a |
@@ -121,13 +121,12 @@ class SoSIPMap(SoSMap):
|
|
|
bffc8a |
# network and if it has, replace the default /32 netmask that
|
|
|
bffc8a |
# ipaddress applies to no CIDR-notated addresses
|
|
|
bffc8a |
self.set_ip_cidr_from_existing_subnet(addr)
|
|
|
bffc8a |
- return self.sanitize_ipaddr(addr)
|
|
|
bffc8a |
else:
|
|
|
bffc8a |
# we have a CIDR notation, so generate an obfuscated network
|
|
|
bffc8a |
# address and then generate an IP address within that network's
|
|
|
bffc8a |
# range
|
|
|
bffc8a |
self.sanitize_network(network)
|
|
|
bffc8a |
- return self.sanitize_ipaddr(addr)
|
|
|
bffc8a |
+ return self.sanitize_ipaddr(addr)
|
|
|
bffc8a |
|
|
|
bffc8a |
def sanitize_network(self, network):
|
|
|
bffc8a |
"""Obfuscate the network address provided, and if there are host bits
|
|
|
bffc8a |
--
|
|
|
bffc8a |
2.26.2
|
|
|
bffc8a |
|