diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-02-04 23:34:51 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-02-04 23:34:51 +0000 |
| commit | 7c2ccc731f1b6ea5b3a44718ebc2816bba6d59bc (patch) | |
| tree | cee451ba0a8af07ee24729fb75ab1b6fd7abf40f /pki/base/ra/setup/registry_instance | |
| parent | 21aa7c44dfa68059ba3f4dc38da91f51fedb7f8b (diff) | |
| download | pki-7c2ccc731f1b6ea5b3a44718ebc2816bba6d59bc.tar.gz pki-7c2ccc731f1b6ea5b3a44718ebc2816bba6d59bc.tar.xz pki-7c2ccc731f1b6ea5b3a44718ebc2816bba6d59bc.zip | |
Bugzilla Bug #606943 - Convert RA to use ldap utilities from
OpenLDAP instead of the Mozldap
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1823 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/ra/setup/registry_instance')
| -rw-r--r-- | pki/base/ra/setup/registry_instance | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pki/base/ra/setup/registry_instance b/pki/base/ra/setup/registry_instance index 09ec620cb..64a73197f 100644 --- a/pki/base/ra/setup/registry_instance +++ b/pki/base/ra/setup/registry_instance @@ -99,19 +99,18 @@ export httpd pki_logs_directory=${PKI_SERVER_ROOT}/logs export pki_logs_directory -# see if httpd is linked with the openldap libraries - we need to override them +# see if httpd is linked with the openldap libraries - we need to override +# their use of OpenSSL if [ ${OS} = "Linux" ]; then hasopenldap=0 /usr/bin/ldd ${httpd} 2>&1 | grep libldap- > /dev/null 2>&1 && hasopenldap=1 if [ ${hasopenldap} -eq 1 ] ; then - LD_PRELOAD="${PKI_SYSTEM_USER_LIBRARIES}/libldap60.so" LD_PRELOAD="${PKI_SYSTEM_USER_LIBRARIES}/libssl3.so:${LD_PRELOAD}" export LD_PRELOAD fi elif [ ${OS} = "SunOS" ]; then - LD_PRELOAD_64="${PKI_SYSTEM_USER_LIBRARIES}/libldap60.so" LD_PRELOAD_64="${PKI_SYSTEM_USER_LIBRARIES}/dirsec/libssl3.so:${LD_PRELOAD_64}" export LD_PRELOAD_64 fi |