diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2000-08-07 03:18:00 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2000-08-07 03:18:00 +0000 |
| commit | 635532053e1e60a3a7c8fe81f3bde7cf8296d1aa (patch) | |
| tree | 385185b7cbde9ed71f94d9271d2863341a19969b /ext/ldap | |
| parent | 6ebea7d35ec10b43b0e1ab6d48fba3bbbecf7554 (diff) | |
| download | php-git-635532053e1e60a3a7c8fe81f3bde7cf8296d1aa.tar.gz | |
fixed for openldap 2.0beta.
Diffstat (limited to 'ext/ldap')
| -rw-r--r-- | ext/ldap/ldap.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index c30bfc4229..a45f629518 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -170,6 +170,9 @@ PHP_MSHUTDOWN_FUNCTION(ldap) PHP_MINFO_FUNCTION(ldap) { char maxl[32]; +#ifdef LDAP_API_VERSION + char ldapapiversion[32]; +#endif #if HAVE_NSLDAP char tmp[32]; LDAPVersion ver; @@ -194,7 +197,10 @@ PHP_MINFO_FUNCTION(ldap) php_info_print_table_row(2, "LDAP Support", "enabled" ); php_info_print_table_row(2, "RCS Version", "$Id$" ); php_info_print_table_row(2, "Total Links", maxl ); - +#ifdef LDAP_API_VERSION + snprintf(ldapapiversion, 31, "%ld", LDAP_API_VERSION); + php_info_print_table_row(2, "API Version", ldapapiversion); +#endif #if HAVE_NSLDAP snprintf(tmp, 31, "%f", SDKVersion/100.0 ); @@ -549,17 +555,29 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) /* sizelimit */ if(ldap_sizelimit > -1) { +#if LDAP_API_VERSION < 2004 ldap->ld_sizelimit = ldap_sizelimit; +#else + ldap_set_option(ldap, LDAP_OPT_SIZELIMIT, &ldap_sizelimit); +#endif } /* timelimit */ if(ldap_timelimit > -1) { +#if LDAP_API_VERSION < 2004 ldap->ld_timelimit = ldap_timelimit; +#else + ldap_set_option(ldap, LDAP_OPT_TIMELIMIT, &ldap_timelimit); +#endif } /* deref */ if(ldap_deref > -1) { +#if LDAP_API_VERSION < 2004 ldap->ld_deref = ldap_deref; +#else + ldap_set_option(ldap, LDAP_OPT_DEREF, &ldap_deref); +#endif } /* Run the actual search */ |