diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2010-11-10 17:33:02 -0500 |
|---|---|---|
| committer | Adam Young <ayoung@redhat.com> | 2010-11-11 08:53:15 -0500 |
| commit | 6a9846f3f3d04800e2fab64eb52dee887af8af60 (patch) | |
| tree | ef4927e04f82b52bc9a54fa14c96a5ed8e16600f /ipaserver/install | |
| parent | 1db42b546178469eb2f9c3505a149a5cd5fd724a (diff) | |
| download | freeipa-6a9846f3f3d04800e2fab64eb52dee887af8af60.tar.gz freeipa-6a9846f3f3d04800e2fab64eb52dee887af8af60.tar.xz freeipa-6a9846f3f3d04800e2fab64eb52dee887af8af60.zip | |
Set CACERTDIR during install to work around openldap bug
Even though ldap.conf(5) claims that LDAPTLS_CACERT takes precedence over
LDAPTLS_CACERTDIR, this seems to be broken in F14. This patch works around
the issue by setting both into the environment.
https://fedorahosted.org/freeipa/ticket/467
Diffstat (limited to 'ipaserver/install')
| -rw-r--r-- | ipaserver/install/dsinstance.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index b6fcb4e21..89613bc31 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -497,7 +497,9 @@ class DsInstance(service.Service): "-y", dmpwdfile, "-T", admpwdfile, "uid=admin,cn=users,cn=accounts,"+self.suffix] try: - ipautil.run(args, env = { 'LDAPTLS_CACERT':CACERT }) + env = { 'LDAPTLS_CACERTDIR':os.path.dirname(CACERT), + 'LDAPTLS_CACERT':CACERT } + ipautil.run(args, env=env) logging.debug("ldappasswd done") except ipautil.CalledProcessError, e: print "Unable to set admin password", e |