From 052de4308c64b126bee440e970be4cf8449c5ebc Mon Sep 17 00:00:00 2001
From: Stanislav Laznicka <slaznick@redhat.com>
Date: Mar 01 2017 13:39:44 +0000
Subject: 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>

---

diff --git a/ipaserver/secrets/store.py b/ipaserver/secrets/store.py
index 6a448a3..56cbfbc 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)