summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Kupka <dkupka@redhat.com>2017-03-20 12:48:14 +0100
committerPavel Vomacka <pvomacka@redhat.com>2017-03-21 09:46:44 +0100
commit4297ad6db0d4f39d82fd155323163df92b2b7894 (patch)
tree93dc4bb80f546fa0a150f9ec1a44d8ab4814ca6e
parent7f567286f6b89f3e981af02913e833d3e8ed5064 (diff)
downloadfreeipa-4297ad6db0d4f39d82fd155323163df92b2b7894.tar.gz
freeipa-4297ad6db0d4f39d82fd155323163df92b2b7894.tar.xz
freeipa-4297ad6db0d4f39d82fd155323163df92b2b7894.zip
ipapython.ipautil.nolog_replace: Do not replace empty value
When provided empty value in nolog parameter nolog_replace added 'XXXXXXXX' three (once for plain value, once for http quoted value and last time for shell quoted value) times before every character (including terminating '\0') in the string. https://pagure.io/freeipa/issue/6738 Reviewed-By: Pavel Vomacka <pvomacka@redhat.com>
-rw-r--r--ipapython/ipautil.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 60b4a37fe..cd66328e6 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -505,7 +505,7 @@ def run(args, stdin=None, raiseonerr=True, nolog=(), env=None,
def nolog_replace(string, nolog):
"""Replace occurences of strings given in `nolog` with XXXXXXXX"""
for value in nolog:
- if not isinstance(value, six.string_types):
+ if not value or not isinstance(value, six.string_types):
continue
quoted = urllib.parse.quote(value)