diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2007-07-31 18:37:32 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2007-07-31 18:37:32 +0000 |
| commit | ec8fdaa516430d05e86ca44c496e9fbe6b5f5109 (patch) | |
| tree | 323ec466815da75bf8fc744532208c70075a1115 /ldap | |
| parent | 5e2414c413becd160b6a93acd702efdc1e6b5faf (diff) | |
| download | libapr-util-ec8fdaa516430d05e86ca44c496e9fbe6b5f5109.tar.gz | |
Support Tivoli ITDS LDAP client library, without SSL support
for now.
Submitted by: Paul Reder
I tweaked this to
* remove comment about how SSL support might be added later
* move some variable declarations in ldap/apr_ldap_option.c
that weren't needed when SSL wasn't supported
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@561430 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'ldap')
| -rw-r--r-- | ldap/apr_ldap_option.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ldap/apr_ldap_option.c b/ldap/apr_ldap_option.c index 15d216a2..2dd83989 100644 --- a/ldap/apr_ldap_option.c +++ b/ldap/apr_ldap_option.c @@ -179,10 +179,10 @@ APU_DECLARE(int) apr_ldap_set_option(apr_pool_t *pool, static void option_set_tls(apr_pool_t *pool, LDAP *ldap, const void *invalue, apr_ldap_err_t *result) { - int tls = * (const int *)invalue; - #if APR_HAS_LDAP_SSL /* compiled with ssl support */ + int tls = * (const int *)invalue; + /* Netscape/Mozilla/Solaris SDK */ #if APR_HAS_NETSCAPE_LDAPSDK || APR_HAS_SOLARIS_LDAPSDK || APR_HAS_MOZILLA_LDAPSK #if APR_HAS_LDAPSSL_INSTALL_ROUTINES @@ -350,12 +350,11 @@ static void option_set_tls(apr_pool_t *pool, LDAP *ldap, const void *invalue, static void option_set_cert(apr_pool_t *pool, LDAP *ldap, const void *invalue, apr_ldap_err_t *result) { +#if APR_HAS_LDAP_SSL apr_array_header_t *certs = (apr_array_header_t *)invalue; struct apr_ldap_opt_tls_cert_t *ents = (struct apr_ldap_opt_tls_cert_t *)certs->elts; int i = 0; -#if APR_HAS_LDAP_SSL - /* Netscape/Mozilla/Solaris SDK */ #if APR_HAS_NETSCAPE_LDAPSDK || APR_HAS_SOLARIS_LDAPSDK || APR_HAS_MOZILLA_LDAPSDK #if APR_HAS_LDAPSSL_CLIENT_INIT |