summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/krbinstance.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2012-02-13 08:10:16 -0500
committerRob Crittenden <rcritten@redhat.com>2012-02-26 23:26:54 -0500
commita09063cbb83aa9c3c77886fe43d70ba15fe4ef48 (patch)
tree9a28dac715d0eef50c4e29e06099ed268c748b1e /ipaserver/install/krbinstance.py
parent7fe63f823388648c671389e7146b91c2fec7b2ca (diff)
downloadfreeipa-a09063cbb83aa9c3c77886fe43d70ba15fe4ef48.tar.gz
freeipa-a09063cbb83aa9c3c77886fe43d70ba15fe4ef48.tar.xz
freeipa-a09063cbb83aa9c3c77886fe43d70ba15fe4ef48.zip
Make sure the nolog argument to ipautil.run is not a bare string
ipautil.run expects a tuple of passwords for nolog; passing a single string causes all individual letters from that string to be replaced by Xes. This fixes such a call, and adds a sanity check to ipautil.run that prevents lone strings from being used in nolog. https://fedorahosted.org/freeipa/ticket/2419
Diffstat (limited to 'ipaserver/install/krbinstance.py')
-rw-r--r--ipaserver/install/krbinstance.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py
index 75907174f..02890ac96 100644
--- a/ipaserver/install/krbinstance.py
+++ b/ipaserver/install/krbinstance.py
@@ -305,7 +305,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"