diff options
| -rw-r--r-- | ipapython/ipautil.py | 8 | ||||
| -rw-r--r-- | ipaserver/install/krbinstance.py | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index 3cb3683b..20f7578c 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -241,6 +241,14 @@ def run(args, stdin=None, raiseonerr=True, p_out = None p_err = None + if isinstance(nolog, basestring): + # We expect a tuple (or list, or other iterable) of nolog strings. + # Passing just a single string is bad: strings are also, so this + # would result in every individual character of that string being + # replaced by XXXXXXXX. + # This is a sanity check to prevent that. + raise ValueError('nolog must be a tuple of strings.') + if env is None: # copy default env env = copy.deepcopy(os.environ) diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index 365ada25..4654aa39 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -304,7 +304,7 @@ class KrbInstance(service.Service): self.master_password + '\n', ) try: - ipautil.run(args, nolog=(self.master_password), stdin=''.join(dialogue)) + ipautil.run(args, nolog=(self.master_password,), stdin=''.join(dialogue)) except ipautil.CalledProcessError, e: print "Failed to initialize the realm container" |