diff options
| author | Stanislav Laznicka <slaznick@redhat.com> | 2017-03-01 14:07:44 +0100 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2017-03-01 13:39:44 +0000 |
| commit | 052de4308c64b126bee440e970be4cf8449c5ebc (patch) | |
| tree | d0d9b1434d3117a313a38bba7d1d49499056d9ec | |
| parent | 79c0e6d355c9e7bcc7cacc37faaba8e999d56400 (diff) | |
| download | freeipa-052de4308c64b126bee440e970be4cf8449c5ebc.tar.gz freeipa-052de4308c64b126bee440e970be4cf8449c5ebc.tar.xz freeipa-052de4308c64b126bee440e970be4cf8449c5ebc.zip | |
Fix replica with --setup-ca issues
nolog argument of ipautil.run requires tuple, not a string.
https://fedorahosted.org/freeipa/ticket/5695
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
| -rw-r--r-- | ipaserver/secrets/store.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipaserver/secrets/store.py b/ipaserver/secrets/store.py index 6a448a348..56cbfbc3a 100644 --- a/ipaserver/secrets/store.py +++ b/ipaserver/secrets/store.py @@ -207,7 +207,7 @@ class PEMFileHandler(DBMAPHandler): args.extend(["-inkey", self.keyfile]) try: - ipautil.run(args, nolog=password) + ipautil.run(args, nolog=(password, )) with open(tmpfile, 'r') as f: data = f.read() finally: @@ -231,7 +231,7 @@ class PEMFileHandler(DBMAPHandler): "-clcerts", "-nokeys", "-out", self.certfile, "-passin", "pass:{pwd}".format(pwd=password)], - nolog=(password)) + nolog=(password, )) if self.keyfile is not None: # get the private key from the file @@ -241,7 +241,7 @@ class PEMFileHandler(DBMAPHandler): "-nocerts", "-nodes", "-out", self.keyfile, "-passin", "pass:{pwd}".format(pwd=password)], - nolog=(password)) + nolog=(password, )) finally: os.remove(tmpdata) |