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

venaas Tue Nov 13 12:10:08 2001 EDT Modified files: /php4/ext/ldap php_ldap.h ldap.c Log: Removed some old cruft (some commented code and non-used globals), fixed a proto typo, and make sure ldap_base_dn and ldap_filter are initialized in php_ldap_do_search() Index: php4/ext/ldap/php_ldap.h diff -u php4/ext/ldap/php_ldap.h:1.19 php4/ext/ldap/php_ldap.h:1.20 --- php4/ext/ldap/php_ldap.h:1.19 Tue Oct 9 17:14:14 2001 +++ php4/ext/ldap/php_ldap.h Tue Nov 13 12:10:08 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ldap.h,v 1.19 2001/10/09 21:14:14 venaas Exp $ */ +/* $Id: php_ldap.h,v 1.20 2001/11/13 17:10:08 venaas Exp $ */ #ifndef PHP_LDAP_H #define PHP_LDAP_H @@ -98,10 +98,8 @@ #endif ZEND_BEGIN_MODULE_GLOBALS(ldap) - long default_link; long num_links; long max_links; - char *base_dn; ZEND_END_MODULE_GLOBALS(ldap) #ifdef ZTS Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.101 php4/ext/ldap/ldap.c:1.102 --- php4/ext/ldap/ldap.c:1.101 Mon Nov 5 06:50:52 2001 +++ php4/ext/ldap/ldap.c Tue Nov 13 12:10:08 2001 @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.101 2001/11/05 11:50:52 venaas Exp $ */ +/* $Id: ldap.c,v 1.102 2001/11/13 17:10:08 venaas Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -161,7 +161,6 @@ */ PHP_INI_BEGIN() STD_PHP_INI_ENTRY_EX("ldap.max_links", "-1", PHP_INI_SYSTEM, OnUpdateInt, max_links, zend_ldap_globals, ldap_globals, display_link_numbers) - STD_PHP_INI_ENTRY("ldap.base_dn", NULL, PHP_INI_ALL, OnUpdateString, base_dn, zend_ldap_globals, ldap_globals) PHP_INI_END() /* }}} */ @@ -257,7 +256,7 @@ 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.101 2001/11/05 11:50:52 venaas Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.102 2001/11/13 17:10:08 venaas Exp $" ); php_info_print_table_row(2, "Total Links", maxl ); #ifdef LDAP_API_VERSION @@ -303,16 +302,12 @@ int authmode; int ssl=0; #endif - /* char *hashed_details; - int hashed_details_length;*/ LDAP *ldap; switch(ZEND_NUM_ARGS()) { case 0: host = NULL; port = 0; - /* hashed_details = estrndup("ldap_", 5); - hashed_details_length = 4+1; */ break; case 1: { @@ -325,10 +320,6 @@ convert_to_string_ex(yyhost); host = Z_STRVAL_PP(yyhost); port = 389; /* Default port */ - - /* hashed_details_length = Z_STRLEN_P(yyhost)+4+1; - hashed_details = emalloc(hashed_details_length+1); - sprintf(hashed_details, "ldap_%s", Z_STRVAL_P(yyhost));*/ } break; @@ -343,11 +334,6 @@ host = Z_STRVAL_PP(yyhost); convert_to_long_ex(yyport); port = Z_LVAL_PP(yyport); - - /* Do we need to take care of hosts running multiple LDAP servers ? */ - /* hashed_details_length = Z_STRLEN_P(yyhost)+4+1; - hashed_details = emalloc(hashed_details_length+1); - sprintf(hashed_details, "ldap_%s", Z_STRVAL_P(yyhost));*/ } break; #ifdef HAVE_ORALDAP @@ -503,7 +489,7 @@ } /* }}} */ -/* {{{ hp_set_opts +/* {{{ php_set_opts */ static void php_set_opts(LDAP *ldap, int sizelimit, int timelimit, int deref) { @@ -541,7 +527,8 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) { pval **link, **base_dn, **filter, **attrs, **attr, **attrsonly, **sizelimit, **timelimit, **deref; - char *ldap_base_dn, *ldap_filter; + char *ldap_base_dn = NULL; + char *ldap_filter = NULL; char **ldap_attrs = NULL; LDAP *ldap; LDAPMessage *ldap_res; @@ -1335,7 +1322,6 @@ ldap_mods[i]->mod_bvalues = emalloc((num_values + 1) * sizeof(struct berval *)); /* allow for arrays with one element, no allowance for arrays with none but probably not required, gerrit thomson. */ -/* if (num_values == 1) {*/ if ((num_values == 1) && (Z_TYPE_PP(value) != IS_ARRAY)) { convert_to_string_ex(value); ldap_mods[i]->mod_bvalues[0] = (struct berval *) emalloc (sizeof(struct berval)); @@ -1362,8 +1348,7 @@ ldap_mods[num_attribs] = NULL; /* check flag to see if do_mod was called to perform full add , gerrit thomson */ -/* if (oper == LDAP_MOD_ADD) { */ - if (is_full_add == 1) { + if (is_full_add == 1) { if (ldap_add_s(ldap, ldap_dn, ldap_mods) != LDAP_SUCCESS) { ldap_perror(ldap, "LDAP"); php_error(E_WARNING, "LDAP: add operation could not be completed."); @@ -1397,7 +1382,6 @@ PHP_FUNCTION(ldap_add) { /* use a newly define parameter into the do_modify so ldap_mod_add can be used the way it is supposed to be used , Gerrit THomson */ - /* php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_ADD);*/ php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_LD_FULL_ADD); } /* }}} */ @@ -1436,9 +1420,6 @@ php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_DELETE); } /* }}} */ - -/* end of attribute based functions , gerrit thomson */ - /* {{{ proto int ldap_delete(int link, string dn) Delete an entry from a directory */