cvs: php4 /ext/ldap ldap.c

venaas Tue Nov 13 13:05:47 2001 EDT Modified files: /php4/ext/ldap ldap.c Log: Minor changes in ldap_connect(): fixed crash with OpenLDAP 2 libs when called without args and also use ldap_init() rather than ldap_open(); simplified code a little Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.102 php4/ext/ldap/ldap.c:1.103 --- php4/ext/ldap/ldap.c:1.102 Tue Nov 13 12:10:08 2001 +++ php4/ext/ldap/ldap.c Tue Nov 13 13:05:47 2001 @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.102 2001/11/13 17:10:08 venaas Exp $ */ +/* $Id: ldap.c,v 1.103 2001/11/13 18:05:47 venaas Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -256,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.102 2001/11/13 17:10:08 venaas Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.103 2001/11/13 18:05:47 venaas Exp $" ); php_info_print_table_row(2, "Total Links", maxl ); #ifdef LDAP_API_VERSION @@ -295,8 +295,8 @@ Connect to an LDAP server */ PHP_FUNCTION(ldap_connect) { - char *host; - int port; + char *host = NULL; + int port = 389; /* Default port */ #ifdef HAVE_ORALDAP char *wallet, *walletpasswd; int authmode; @@ -306,8 +306,6 @@ switch(ZEND_NUM_ARGS()) { case 0: - host = NULL; - port = 0; break; case 1: { @@ -319,7 +317,6 @@ convert_to_string_ex(yyhost); host = Z_STRVAL_PP(yyhost); - port = 389; /* Default port */ } break; @@ -339,7 +336,7 @@ #ifdef HAVE_ORALDAP case 5: { - pval **yyhost, **yyport, **yywallet, **yywalletpasswd, **yyauthmode; + pval **yyhost, **yyport, **yywallet, **yywalletpasswd, **yyauthmode; if (zend_get_parameters_ex(5, &yyhost, &yyport, &yywallet, &yywalletpasswd, &yyauthmode) == FAILURE) { RETURN_FALSE; @@ -371,7 +368,7 @@ } #ifdef LDAP_API_FEATURE_X_OPENLDAP - if (strchr(host, '/')) { + if (host != NULL && strchr(host, '/')) { int rc; rc = ldap_initialize(&ldap, host); @@ -379,11 +376,12 @@ php_error(E_WARNING, "Could not create LDAP session handle (%d): %s\n", rc, ldap_err2string(rc)); RETURN_FALSE; } - } else -#endif - { - ldap = ldap_open(host, port); + } else { + ldap = ldap_init(host, port); } +#else + ldap = ldap_open(host, port); +#endif if ( ldap == NULL ) { RETURN_FALSE;