cvs: php4 /ext/ldap config.m4 ldap.c

venaas Sat Jun 22 07:41:37 2002 EDT Modified files: /php4/ext/ldap config.m4 ldap.c Log: Added test for ldap_start_tls_s() Index: php4/ext/ldap/config.m4 diff -u php4/ext/ldap/config.m4:1.23 php4/ext/ldap/config.m4:1.24 --- php4/ext/ldap/config.m4:1.23 Tue Mar 12 11:22:40 2002 +++ php4/ext/ldap/config.m4 Sat Jun 22 07:41:36 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.23 2002/03/12 16:22:40 sas Exp $ +dnl $Id: config.m4,v 1.24 2002/06/22 11:41:36 venaas Exp $ dnl AC_DEFUN(PHP_LDAP_CHECKS, [ @@ -103,6 +103,8 @@ fi CPPFLAGS=$_SAVE_CPPFLAGS - dnl Solaris 2.8 claims to be 2004 API, but doesn't have ldap_parse_reference + dnl Solaris 2.8 claims to be 2004 API, but doesn't have + dnl ldap_parse_reference() nor ldap_start_tls_s() AC_CHECK_FUNCS(ldap_parse_reference) + AC_CHECK_FUNCS(ldap_start_tls_s) fi Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.119 php4/ext/ldap/ldap.c:1.120 --- php4/ext/ldap/ldap.c:1.119 Fri Jun 21 18:22:46 2002 +++ php4/ext/ldap/ldap.c Sat Jun 22 07:41:36 2002 @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.119 2002/06/21 22:22:46 mfischer Exp $ */ +/* $Id: ldap.c,v 1.120 2002/06/22 11:41:36 venaas Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -275,7 +275,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.119 2002/06/21 22:22:46 mfischer Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.120 2002/06/22 11:41:36 venaas Exp $" ); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); @@ -2028,6 +2028,7 @@ Start TLS */ PHP_FUNCTION(ldap_start_tls) { +#ifdef HAVE_LDAP_START_TLS_S pval **link; ldap_linkdata *ld; @@ -2044,6 +2045,10 @@ } else { RETURN_TRUE; } +#else + php_error(E_ERROR, "ldap_start_tls not available in this LDAP library"); + RETURN_FALSE; +#endif } /* }}} */ #endif