cvs: php4 /ext/ldap ldap.c php_ldap.h

sniper Sat Oct 28 12:22:47 2000 EDT Modified files: /php4/ext/ldap ldap.c php_ldap.h Log: Fix for bug #7416. ldap_set|get_option() are also in NSLDAP SDKs. Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.69 php4/ext/ldap/ldap.c:1.70 --- php4/ext/ldap/ldap.c:1.69 Wed Oct 25 10:43:56 2000 +++ php4/ext/ldap/ldap.c Sat Oct 28 12:22:46 2000 @@ -23,7 +23,7 @@ */ -/* $Id: ldap.c,v 1.69 2000/10/25 17:43:56 andrei Exp $ */ +/* $Id: ldap.c,v 1.70 2000/10/28 19:22:46 sniper Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -93,7 +93,7 @@ PHP_FE(ldap_error, NULL) PHP_FE(ldap_compare, NULL) -#if LDAP_API_VERSION > 2000 +#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP PHP_FE(ldap_get_option, third_argument_force_ref) PHP_FE(ldap_set_option, NULL) #endif @@ -161,7 +161,7 @@ REGISTER_MAIN_LONG_CONSTANT("LDAP_DEREF_ALWAYS", LDAP_DEREF_ALWAYS, CONST_PERSISTENT | CONST_CS); -#if LDAP_API_VERSION > 2000 +#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP /* LDAP options */ REGISTER_MAIN_LONG_CONSTANT("LDAP_OPT_DEREF", LDAP_OPT_DEREF, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("LDAP_OPT_SIZELIMIT", LDAP_OPT_SIZELIMIT, CONST_PERSISTENT | CONST_CS); @@ -224,10 +224,10 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled" ); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.69 2000/10/25 17:43:56 andrei Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.70 2000/10/28 19:22:46 sniper Exp $" ); php_info_print_table_row(2, "Total Links", maxl ); #ifdef LDAP_API_VERSION - snprintf(ldapapiversion, 31, "%ld", LDAP_API_VERSION); + snprintf(ldapapiversion, 31, "%d", LDAP_API_VERSION); php_info_print_table_row(2, "API Version", ldapapiversion); #endif #if HAVE_NSLDAP @@ -649,7 +649,7 @@ /* sizelimit */ if(ldap_sizelimit > -1) { -#if LDAP_API_VERSION < 2004 +#if ( LDAP_API_VERSION < 2004 ) || HAVE_NSLDAP ldap->ld_sizelimit = ldap_sizelimit; #else ldap_set_option(ldap, LDAP_OPT_SIZELIMIT, &ldap_sizelimit); @@ -658,7 +658,7 @@ /* timelimit */ if(ldap_timelimit > -1) { -#if LDAP_API_VERSION < 2004 +#if ( LDAP_API_VERSION < 2004 ) || HAVE_NSLDAP ldap->ld_timelimit = ldap_timelimit; #else ldap_set_option(ldap, LDAP_OPT_TIMELIMIT, &ldap_timelimit); @@ -667,7 +667,7 @@ /* deref */ if(ldap_deref > -1) { -#if LDAP_API_VERSION < 2004 +#if ( LDAP_API_VERSION < 2004 ) || HAVE_NSLDAP ldap->ld_deref = ldap_deref; #else ldap_set_option(ldap, LDAP_OPT_DEREF, &ldap_deref); @@ -1506,7 +1506,7 @@ /* }}} */ -#if LDAP_API_VERSION > 2000 +#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP /* {{{ proto boolean ldap_get_option(int link, int option, mixed retval) Get the current value of various session-wide parameters */ PHP_FUNCTION(ldap_get_option) { @@ -1550,20 +1550,19 @@ case LDAP_OPT_MATCHED_DN: { char *val; - int len; if (ldap_get_option(ldap, opt, &val)) { RETURN_FALSE; } zval_dtor(*retval); - ZVAL_STRING(*retval, val, 1); + ZVAL_STRING(*retval, val, 1); ldap_memfree(val); } break; - /* options not implemented +/* options not implemented case LDAP_OPT_SERVER_CONTROLS: case LDAP_OPT_CLIENT_CONTROLS: case LDAP_OPT_API_INFO: case LDAP_OPT_API_FEATURE_INFO: - */ +*/ default: RETURN_FALSE; } Index: php4/ext/ldap/php_ldap.h diff -u php4/ext/ldap/php_ldap.h:1.12 php4/ext/ldap/php_ldap.h:1.13 --- php4/ext/ldap/php_ldap.h:1.12 Tue Oct 17 09:06:04 2000 +++ php4/ext/ldap/php_ldap.h Sat Oct 28 12:22:46 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ldap.h,v 1.12 2000/10/17 16:06:04 venaas Exp $ */ +/* $Id: php_ldap.h,v 1.13 2000/10/28 19:22:46 sniper Exp $ */ #ifndef PHP_LDAP_H #define PHP_LDAP_H @@ -81,7 +81,7 @@ PHP_FUNCTION(ldap_compare); -#if LDAP_API_VERSION > 2000 +#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP PHP_FUNCTION(ldap_get_option); PHP_FUNCTION(ldap_set_option); #endif