diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2013-09-25 08:33:35 +0000 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2013-10-04 10:27:23 +0200 |
| commit | c123264ac77cd533a08978909f837c8f4d3e224e (patch) | |
| tree | 965318ce39f7dcec2ff871b0fed07b810f2145d2 /ipaserver/install/ipa_replica_prepare.py | |
| parent | 46b358811210ecb83e5ea092d0d0554c923b9823 (diff) | |
| download | freeipa.git-c123264ac77cd533a08978909f837c8f4d3e224e.tar.gz freeipa.git-c123264ac77cd533a08978909f837c8f4d3e224e.tar.xz freeipa.git-c123264ac77cd533a08978909f837c8f4d3e224e.zip | |
Read passwords from stdin when importing PKCS#12 files with pk12util.
This works around pk12util refusing to use empty password files, which prevents
the use of PKCS#12 files with empty password.
https://fedorahosted.org/freeipa/ticket/3897
Diffstat (limited to 'ipaserver/install/ipa_replica_prepare.py')
| -rw-r--r-- | ipaserver/install/ipa_replica_prepare.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ipaserver/install/ipa_replica_prepare.py b/ipaserver/install/ipa_replica_prepare.py index 904b8727..55b81eee 100644 --- a/ipaserver/install/ipa_replica_prepare.py +++ b/ipaserver/install/ipa_replica_prepare.py @@ -137,9 +137,8 @@ class ReplicaPrepare(admintool.AdminTool): "could not find directory instance: %s" % config_dir) def check_pkcs12(self, pkcs12_file, pkcs12_pin): - pin_file = ipautil.write_tmp_file(pkcs12_pin) installutils.check_pkcs12( - pkcs12_info=(pkcs12_file, pin_file.name), + pkcs12_info=(pkcs12_file, pkcs12_pin), ca_file='/etc/ipa/ca.crt', hostname=self.replica_fqdn) |