fixed for openldap 2.0beta.

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index c30bfc422939b8b4b236755a10e231f2a721943b..a45f629518fa99e6e65aa485658b446c231a073c 100644 (file)
--- 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 */