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

venaas Tue Oct 9 17:14:14 2001 EDT Modified files: /php4/ext/ldap ldap.c php_ldap.h Log: Added ldap_start_tls() function @- Added ldap_start_tls() function (Stig Venaas, patch by kuenne@rentec.com) Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.98 php4/ext/ldap/ldap.c:1.99 --- php4/ext/ldap/ldap.c:1.98 Tue Sep 25 18:48:37 2001 +++ php4/ext/ldap/ldap.c Tue Oct 9 17:14:14 2001 @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.98 2001/09/25 22:48:37 jeroen Exp $ */ +/* $Id: ldap.c,v 1.99 2001/10/09 21:14:14 venaas Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -109,7 +109,11 @@ PHP_FE(ldap_parse_reference, third_argument_force_ref) PHP_FE(ldap_rename, NULL) #endif - + +#if LDAP_API_VERSION > 2000 + PHP_FE(ldap_start_tls, NULL) +#endif + #ifdef STR_TRANSLATION PHP_FE(ldap_t61_to_8859, NULL) PHP_FE(ldap_8859_to_t61, NULL) @@ -251,7 +255,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.98 2001/09/25 22:48:37 jeroen Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.99 2001/10/09 21:14:14 venaas Exp $" ); php_info_print_table_row(2, "Total Links", maxl ); #ifdef LDAP_API_VERSION @@ -1941,7 +1945,32 @@ /* }}} */ #endif - +#if LDAP_API_VERSION > 2000 +/* {{{ proto int ldap_start_tls(int link) + Start TLS */ +PHP_FUNCTION(ldap_start_tls) +{ + pval **link; + LDAP *ldap; + + if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &link) == FAILURE) { + WRONG_PARAM_COUNT; + } + + ZEND_FETCH_RESOURCE(ldap, LDAP *, link, -1, "ldap link", le_link); + + if (ldap_start_tls_s(ldap, NULL, NULL) != LDAP_SUCCESS) { + php_error(E_WARNING,"LDAP: Unable to start TLS: %s", + ldap_err2string(_get_lderrno(ldap))); + RETURN_FALSE; + } else { + RETURN_TRUE; + } +} +/* }}} */ +#endif + + #ifdef STR_TRANSLATION /* {{{ php_ldap_do_translate */ Index: php4/ext/ldap/php_ldap.h diff -u php4/ext/ldap/php_ldap.h:1.18 php4/ext/ldap/php_ldap.h:1.19 --- php4/ext/ldap/php_ldap.h:1.18 Sat Jul 28 07:35:57 2001 +++ php4/ext/ldap/php_ldap.h Tue Oct 9 17:14:14 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ldap.h,v 1.18 2001/07/28 11:35:57 zeev Exp $ */ +/* $Id: php_ldap.h,v 1.19 2001/10/09 21:14:14 venaas Exp $ */ #ifndef PHP_LDAP_H #define PHP_LDAP_H @@ -86,6 +86,10 @@ PHP_FUNCTION(ldap_next_reference); PHP_FUNCTION(ldap_parse_reference); PHP_FUNCTION(ldap_rename); +#endif + +#if LDAP_API_VERSION > 2000 +PHP_FUNCTION(ldap_start_tls); #endif #ifdef STR_TRANSLATION