summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislav Laznicka <slaznick@redhat.com>2017-04-20 10:09:05 +0200
committerJan Cholasta <jcholast@redhat.com>2017-04-20 10:20:27 +0000
commitb38750eaa82025aad56f8eca849f47775b2cbc75 (patch)
treedd15b592d4a138640b56eae3bb4c43379ef76543
parent4322b57e313105611df39e99097993ba4161ab42 (diff)
downloadfreeipa-b38750eaa82025aad56f8eca849f47775b2cbc75.tar.gz
freeipa-b38750eaa82025aad56f8eca849f47775b2cbc75.tar.xz
freeipa-b38750eaa82025aad56f8eca849f47775b2cbc75.zip
Fix CAInstance.import_ra_cert for empty passwords
OpenSSL can't cope with empty files, add a newline after each password https://pagure.io/freeipa/issue/6878 Reviewed-By: Jan Cholasta <jcholast@redhat.com>
-rw-r--r--ipaserver/install/cainstance.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index b6b915c46..84d60bfdd 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -690,7 +690,7 @@ class CAInstance(DogtagInstance):
Used when setting up replication
"""
- with ipautil.write_tmp_file(password) as f:
+ with ipautil.write_tmp_file(password + '\n') as f:
pwdarg = 'file:{file}'.format(file=f.name)
# get the private key from the file
ipautil.run([paths.OPENSSL,