IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix replica with --setup-ca issues

Browse Source 
nolog argument of ipautil.run requires tuple, not a string.

https://fedorahosted.org/freeipa/ticket/5695

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Stanislav Laznicka 2017-03-01 14:07:44 +01:00 committed by Jan Cholasta
parent 79c0e6d355
commit 052de4308c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipaserver/secrets/store.py
View File

@ -207,7 +207,7 @@ class PEMFileHandler(DBMAPHandler):
args.extend(["-inkey", self.keyfile]) args.extend(["-inkey", self.keyfile])
try: try:
ipautil.run(args, nolog=password) ipautil.run(args, nolog=(password, ))
with open(tmpfile, 'r') as f: with open(tmpfile, 'r') as f:
data = f.read() data = f.read()
finally: finally:
@ -231,7 +231,7 @@ class PEMFileHandler(DBMAPHandler):
"-clcerts", "-nokeys", "-clcerts", "-nokeys",
"-out", self.certfile, "-out", self.certfile,
"-passin", "pass:{pwd}".format(pwd=password)], "-passin", "pass:{pwd}".format(pwd=password)],
nolog=(password)) nolog=(password, ))
if self.keyfile is not None: if self.keyfile is not None:
# get the private key from the file # get the private key from the file
@ -241,7 +241,7 @@ class PEMFileHandler(DBMAPHandler):
"-nocerts", "-nodes", "-nocerts", "-nodes",
"-out", self.keyfile, "-out", self.keyfile,
"-passin", "pass:{pwd}".format(pwd=password)], "-passin", "pass:{pwd}".format(pwd=password)],
nolog=(password)) nolog=(password, ))
finally: finally:
os.remove(tmpdata) os.remove(tmpdata)