PHP_FE(ldap_compare, NULL)
PHP_FE(ldap_sort, NULL)
-#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP
+#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP
PHP_FE(ldap_get_option, third_argument_force_ref)
PHP_FE(ldap_set_option, NULL)
PHP_FE(ldap_parse_result, arg3to6of6_force_ref)
NULL,
NULL,
PHP_MINFO(ldap),
- NO_VERSION_YET,
+ NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
};
-
#ifdef COMPILE_DL_LDAP
ZEND_GET_MODULE(ldap)
#endif
-
static void _close_ldap_link(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
ldap_linkdata *ld = (ldap_linkdata *)rsrc->ptr;
LDAPG(num_links)--;
}
-
static void _free_ldap_result(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
LDAPMessage *result = (LDAPMessage *)rsrc->ptr;
/* {{{ PHP_INI_BEGIN
*/
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_EX("ldap.max_links", "-1", PHP_INI_SYSTEM, OnUpdateInt, max_links, zend_ldap_globals, ldap_globals, display_link_numbers)
PHP_INI_END()
/* }}} */
REGISTER_LONG_CONSTANT("LDAP_DEREF_FINDING", LDAP_DEREF_FINDING, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT("LDAP_DEREF_ALWAYS", LDAP_DEREF_ALWAYS, CONST_PERSISTENT | CONST_CS);
-#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP
+#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP
/* LDAP options */
REGISTER_LONG_CONSTANT("LDAP_OPT_DEREF", LDAP_OPT_DEREF, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT("LDAP_OPT_SIZELIMIT", LDAP_OPT_SIZELIMIT, CONST_PERSISTENT | CONST_CS);
*/
PHP_MSHUTDOWN_FUNCTION(ldap)
{
+ UNREGISTER_INI_ENTRIES();
return SUCCESS;
}
/* }}} */
#endif
php_info_print_table_start();
- php_info_print_table_row(2, "LDAP Support", "enabled" );
- php_info_print_table_row(2, "RCS Version", "$Id$" );
+ php_info_print_table_row(2, "LDAP Support", "enabled");
+ php_info_print_table_row(2, "RCS Version", "$Id$");
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
#endif
#if HAVE_NSLDAP
- SDKVersion = ldap_version( &ver );
- snprintf(tmp, 31, "%f", SDKVersion/100.0 );
- php_info_print_table_row(2, "SDK Version", tmp );
+ SDKVersion = ldap_version(&ver);
+ snprintf(tmp, 31, "%f", SDKVersion/100.0);
+ php_info_print_table_row(2, "SDK Version", tmp);
- snprintf(tmp, 31, "%f", ver.protocol_version/100.0 );
- php_info_print_table_row(2, "Highest LDAP Protocol Supported", tmp );
+ snprintf(tmp, 31, "%f", ver.protocol_version/100.0);
+ php_info_print_table_row(2, "Highest LDAP Protocol Supported", tmp);
- snprintf(tmp, 31, "%f", ver.SSL_version/100.0 );
- php_info_print_table_row(2, "SSL Level Supported", tmp );
+ snprintf(tmp, 31, "%f", ver.SSL_version/100.0);
+ php_info_print_table_row(2, "SSL Level Supported", tmp);
- if ( ver.security_level != LDAP_SECURITY_NONE ) {
- snprintf(tmp, 31, "%d", ver.security_level );
+ if (ver.security_level != LDAP_SECURITY_NONE) {
+ snprintf(tmp, 31, "%d", ver.security_level);
} else {
- strcpy(tmp, "SSL not enabled" );
+ strcpy(tmp, "SSL not enabled");
}
- php_info_print_table_row(2, "Level of Encryption", tmp );
+ php_info_print_table_row(2, "Level of Encryption", tmp);
#endif
php_info_print_table_end();
RETURN_FALSE;
}
- if (ZEND_NUM_ARGS() == 5 ) {
+ if (ZEND_NUM_ARGS() == 5) {
ssl = 1;
}
#else
#endif
if (LDAPG(max_links) != -1 && LDAPG(num_links) >= LDAPG(max_links)) {
- php_error(E_WARNING, "%s(): Too many open links (%ld)", get_active_function_name(TSRMLS_C), LDAPG(num_links));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", LDAPG(num_links));
RETURN_FALSE;
}
ld = ecalloc(1, sizeof(ldap_linkdata));
- if (ld == NULL) {
- RETURN_FALSE;
- }
#ifdef LDAP_API_FEATURE_X_OPENLDAP
if (host != NULL && strchr(host, '/')) {
rc = ldap_initialize(&ldap, host);
if (rc != LDAP_SUCCESS) {
efree(ld);
- php_error(E_WARNING, "%s(): Could not create session handle: %s", get_active_function_name(TSRMLS_C), ldap_err2string(rc));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not create session handle: %s", ldap_err2string(rc));
RETURN_FALSE;
}
} else {
ldap = ldap_open(host, port);
#endif
- if ( ldap == NULL ) {
+ if (ldap == NULL) {
efree(ld);
RETURN_FALSE;
} else {
if (ssl) {
if (ldap_init_SSL(&ldap->ld_sb, wallet, walletpasswd, authmode)) {
efree(ld);
- php_error(E_WARNING, "%s(): SSL init failed", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSL init failed");
RETURN_FALSE;
}
}
ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
if ((rc = ldap_bind_s(ld->link, ldap_bind_dn, ldap_bind_pw, LDAP_AUTH_SIMPLE)) != LDAP_SUCCESS) {
- php_error(E_WARNING, "%s(): Unable to bind to server: %s", get_active_function_name(TSRMLS_C), ldap_err2string(rc));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to bind to server: %s", ldap_err2string(rc));
RETURN_FALSE;
} else {
RETURN_TRUE;
{
/* sizelimit */
if (sizelimit > -1) {
-#if ( LDAP_API_VERSION >= 2004 ) || HAVE_NSLDAP
+#if (LDAP_API_VERSION >= 2004) || HAVE_NSLDAP
ldap_set_option(ldap, LDAP_OPT_SIZELIMIT, &sizelimit);
#else
ldap->ld_sizelimit = sizelimit;
/* timelimit */
if (timelimit > -1) {
-#if ( LDAP_API_VERSION >= 2004 ) || HAVE_NSLDAP
+#if (LDAP_API_VERSION >= 2004) || HAVE_NSLDAP
ldap_set_option(ldap, LDAP_OPT_TIMELIMIT, &timelimit);
#else
ldap->ld_timelimit = timelimit;
/* deref */
if (deref > -1) {
-#if ( LDAP_API_VERSION >= 2004 ) || HAVE_NSLDAP
+#if (LDAP_API_VERSION >= 2004) || HAVE_NSLDAP
ldap_set_option(ldap, LDAP_OPT_DEREF, &deref);
#else
ldap->ld_deref = deref;
*/
static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
{
- pval **link, **base_dn, **filter, **attrs, **attr, **attrsonly, **sizelimit, **timelimit, **deref;
+ zval **link, **base_dn, **filter, **attrs, **attr, **attrsonly, **sizelimit, **timelimit, **deref;
char *ldap_base_dn = NULL;
char *ldap_filter = NULL;
char **ldap_attrs = NULL;
ldap_linkdata *ld;
LDAPMessage *ldap_res;
- int ldap_attrsonly = 0;
+ int ldap_attrsonly = 0;
int ldap_sizelimit = -1;
int ldap_timelimit = -1;
int ldap_deref = -1;
int num_attribs = 0;
int i, errno;
int myargcount = ZEND_NUM_ARGS();
-
+
if (myargcount < 3 || myargcount > 8 || zend_get_parameters_ex(myargcount, &link, &base_dn, &filter, &attrs, &attrsonly, &sizelimit, &timelimit, &deref) == FAILURE) {
WRONG_PARAM_COUNT;
}
/* Reverse -> fall through */
- switch(myargcount) {
+ switch (myargcount) {
case 8 :
convert_to_long_ex(deref);
ldap_deref = Z_LVAL_PP(deref);
case 4 :
if (Z_TYPE_PP(attrs) != IS_ARRAY) {
- php_error(E_WARNING, "%s(): Expected Array as last element", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected Array as last element");
RETURN_FALSE;
}
num_attribs = zend_hash_num_elements(Z_ARRVAL_PP(attrs));
- if ((ldap_attrs = safe_emalloc((num_attribs+1), sizeof(char *), 0)) == NULL) {
- php_error(E_WARNING, "%s(): Could not allocate memory", get_active_function_name(TSRMLS_C));
- RETURN_FALSE;
- }
+ ldap_attrs = safe_emalloc((num_attribs+1), sizeof(char *), 0);
- for(i=0; i<num_attribs; i++) {
- if(zend_hash_index_find(Z_ARRVAL_PP(attrs), i, (void **) &attr) == FAILURE) {
- php_error(E_WARNING, "%s(): Array initialization wrong", get_active_function_name(TSRMLS_C));
+ for (i = 0; i<num_attribs; i++) {
+ if (zend_hash_index_find(Z_ARRVAL_PP(attrs), i, (void **) &attr) == FAILURE) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array initialization wrong");
efree(ldap_attrs);
RETURN_FALSE;
}
nlinks = zend_hash_num_elements(Z_ARRVAL_PP(link));
if (nlinks == 0) {
- php_error(E_WARNING, "%s(): No links in link array", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "No links in link array");
if (ldap_attrs != NULL) {
efree(ldap_attrs);
}
if (Z_TYPE_PP(base_dn) == IS_ARRAY) {
nbases = zend_hash_num_elements(Z_ARRVAL_PP(base_dn));
if (nbases != nlinks) {
- php_error(E_WARNING, "%s(): Base must either be a string, or an array with the same number of elements as the links array", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Base must either be a string, or an array with the same number of elements as the links array");
if (ldap_attrs != NULL) {
efree(ldap_attrs);
}
if (Z_TYPE_PP(filter) == IS_ARRAY) {
nfilters = zend_hash_num_elements(Z_ARRVAL_PP(filter));
if (nfilters != nlinks) {
- php_error(E_WARNING, "%s(): Filter must either be a string, or an array with the same number of elements as the links array", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Filter must either be a string, or an array with the same number of elements as the links array");
if (ldap_attrs != NULL) {
efree(ldap_attrs);
}
efree(ldap_attrs);
}
- if (array_init(return_value) == FAILURE) {
- efree(lds);
- efree(rcs);
- RETURN_FALSE;
- }
+ array_init(return_value);
/* Collect results from the searches */
for (i=0; i<nlinks; i++) {
}
/* fix to make null base_dn's work */
- if ( strlen(ldap_base_dn) < 1 ) {
- ldap_base_dn = NULL;
+ if (strlen(ldap_base_dn) < 1) {
+ ldap_base_dn = NULL;
}
ld = (ldap_linkdata *) zend_fetch_resource(link TSRMLS_CC, -1, "ldap link", NULL, 1, le_link);
}
if (errno != LDAP_SUCCESS
- && errno != LDAP_SIZELIMIT_EXCEEDED
+ && errno != LDAP_SIZELIMIT_EXCEEDED
#ifdef LDAP_ADMINLIMIT_EXCEEDED
- && errno != LDAP_ADMINLIMIT_EXCEEDED
+ && errno != LDAP_ADMINLIMIT_EXCEEDED
#endif
#ifdef LDAP_REFERRAL
- && errno != LDAP_REFERRAL
+ && errno != LDAP_REFERRAL
#endif
- ) {
- php_error(E_WARNING, "%s(): Search: %s", get_active_function_name(TSRMLS_C), ldap_err2string(errno));
+ ) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Search: %s", ldap_err2string(errno));
RETVAL_FALSE;
} else {
- if (errno == LDAP_SIZELIMIT_EXCEEDED) {
- php_error(E_WARNING, "%s(): Partial search results returned: Sizelimit exceeded.", get_active_function_name(TSRMLS_C));
+ if (errno == LDAP_SIZELIMIT_EXCEEDED) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Partial search results returned: Sizelimit exceeded.");
}
#ifdef LDAP_ADMINLIMIT_EXCEEDED
else if (errno == LDAP_ADMINLIMIT_EXCEEDED) {
- php_error(E_WARNING, "%s(): Partial search results returned: Adminlimit exceeded.", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Partial search results returned: Adminlimit exceeded.");
}
#endif
Free result memory */
PHP_FUNCTION(ldap_free_result)
{
- pval **result;
+ zval **result;
LDAPMessage *ldap_result;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &result) == FAILURE) {
Count the number of entries in a search result */
PHP_FUNCTION(ldap_count_entries)
{
- pval **link, **result;
+ zval **link, **result;
ldap_linkdata *ld;
LDAPMessage *ldap_result;
Return first result id */
PHP_FUNCTION(ldap_first_entry)
{
- pval **link, **result;
+ zval **link, **result;
ldap_linkdata *ld;
ldap_resultentry *resultentry;
LDAPMessage *ldap_result, *entry;
Get next result entry */
PHP_FUNCTION(ldap_next_entry)
{
- pval **link, **result_entry;
+ zval **link, **result_entry;
ldap_linkdata *ld;
ldap_resultentry *resultentry, *resultentry_next;
LDAPMessage *entry_next;
Get all result entries */
PHP_FUNCTION(ldap_get_entries)
{
- pval **link, **result;
+ zval **link, **result;
LDAPMessage *ldap_result, *ldap_result_entry;
- pval *tmp1, *tmp2;
+ zval *tmp1, *tmp2;
ldap_linkdata *ld;
LDAP *ldap;
int num_entries, num_attrib, num_values, i;
ldap_result_entry = ldap_first_entry(ldap, ldap_result);
if (ldap_result_entry == NULL) RETURN_FALSE;
- while(ldap_result_entry != NULL) {
+ while (ldap_result_entry != NULL) {
MAKE_STD_ZVAL(tmp1);
array_init(tmp1);
MAKE_STD_ZVAL(tmp2);
array_init(tmp2);
add_assoc_long(tmp2, "count", num_values);
- for(i=0; i < num_values; i++) {
+ for (i = 0; i < num_values; i++) {
add_index_string(tmp2, i, ldap_value[i], 1);
}
ldap_value_free(ldap_value);
attr_len = strlen(attribute);
- zend_hash_update(Z_ARRVAL_P(tmp1), php_strtolower(attribute, attr_len), attr_len+1, (void *) &tmp2, sizeof(pval *), NULL);
+ zend_hash_update(Z_ARRVAL_P(tmp1), php_strtolower(attribute, attr_len), attr_len+1, (void *) &tmp2, sizeof(zval *), NULL);
add_index_string(tmp1, num_attrib, attribute, 1);
num_attrib++;
-#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP || WINDOWS
+#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || WINDOWS
ldap_memfree(attribute);
#endif
attribute = ldap_next_attribute(ldap, ldap_result_entry, ber);
}
-#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP || WINDOWS
+#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || WINDOWS
if (ber != NULL)
ber_free(ber, 0);
#endif
add_assoc_long(tmp1, "count", num_attrib);
dn = ldap_get_dn(ldap, ldap_result_entry);
add_assoc_string(tmp1, "dn", dn, 1);
-#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP || WINDOWS
+#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || WINDOWS
ldap_memfree(dn);
#else
free(dn);
#endif
- zend_hash_index_update(Z_ARRVAL_P(return_value), num_entries, (void *) &tmp1, sizeof(pval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(return_value), num_entries, (void *) &tmp1, sizeof(zval *), NULL);
num_entries++;
ldap_result_entry = ldap_next_entry(ldap, ldap_result_entry);
Return first attribute */
PHP_FUNCTION(ldap_first_attribute)
{
- pval **link, **result_entry, **berp;
+ zval **link, **result_entry, **berp;
ldap_linkdata *ld;
ldap_resultentry *resultentry;
BerElement *ber;
ZEND_REGISTER_RESOURCE(*berp, ber, le_ber_entry);
RETVAL_STRING(attribute, 1);
-#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP || WINDOWS
+#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || WINDOWS
ldap_memfree(attribute);
#endif
}
Get the next attribute in result */
PHP_FUNCTION(ldap_next_attribute)
{
- pval **link, **result_entry, **berp;
+ zval **link, **result_entry, **berp;
ldap_linkdata *ld;
ldap_resultentry *resultentry;
BerElement *ber;
char *attribute;
- if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &link, &result_entry, &berp) == FAILURE ) {
+ if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &link, &result_entry, &berp) == FAILURE) {
WRONG_PARAM_COUNT;
}
ZEND_REGISTER_RESOURCE(*berp, ber, le_ber_entry);
RETVAL_STRING(attribute, 1);
-#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP || WINDOWS
+#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || WINDOWS
ldap_memfree(attribute);
#endif
}
Get attributes from a search result entry */
PHP_FUNCTION(ldap_get_attributes)
{
- pval **link, **result_entry;
- pval *tmp;
+ zval **link, **result_entry;
+ zval *tmp;
ldap_linkdata *ld;
ldap_resultentry *resultentry;
char *attribute;
MAKE_STD_ZVAL(tmp);
array_init(tmp);
add_assoc_long(tmp, "count", num_values);
- for(i=0; i<num_values; i++) {
+ for (i = 0; i < num_values; i++) {
add_index_string(tmp, i, ldap_value[i], 1);
}
ldap_value_free(ldap_value);
- zend_hash_update(Z_ARRVAL_P(return_value), attribute, strlen(attribute)+1, (void *) &tmp, sizeof(pval *), NULL);
+ zend_hash_update(Z_ARRVAL_P(return_value), attribute, strlen(attribute)+1, (void *) &tmp, sizeof(zval *), NULL);
add_index_string(return_value, num_attrib, attribute, 1);
num_attrib++;
-#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP || WINDOWS
+#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || WINDOWS
ldap_memfree(attribute);
#endif
attribute = ldap_next_attribute(ld->link, resultentry->data, ber);
}
-#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP || WINDOWS
- if (ber != NULL)
+#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || WINDOWS
+ if (ber != NULL) {
ber_free(ber, 0);
+ }
#endif
add_assoc_long(return_value, "count", num_attrib);
Get all values from a result entry */
PHP_FUNCTION(ldap_get_values)
{
- pval **link, **result_entry, **attr;
+ zval **link, **result_entry, **attr;
ldap_linkdata *ld;
ldap_resultentry *resultentry;
char *attribute;
attribute = Z_STRVAL_PP(attr);
if ((ldap_value = ldap_get_values(ld->link, resultentry->data, attribute)) == NULL) {
- php_error(E_WARNING, "%s(): Cannot get the value(s) of attribute %s", get_active_function_name(TSRMLS_C), ldap_err2string(_get_lderrno(ld->link)));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot get the value(s) of attribute %s", ldap_err2string(_get_lderrno(ld->link)));
RETURN_FALSE;
}
num_values = ldap_count_values(ldap_value);
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ array_init(return_value);
- for(i=0; i<num_values; i++) {
+ for (i = 0; i<num_values; i++) {
add_next_index_string(return_value, ldap_value[i], 1);
}
Get all values with lengths from a result entry */
PHP_FUNCTION(ldap_get_values_len)
{
- pval **link, **result_entry, **attr;
+ zval **link, **result_entry, **attr;
ldap_linkdata *ld;
ldap_resultentry *resultentry;
char* attribute;
attribute = Z_STRVAL_PP(attr);
if ((ldap_value_len = ldap_get_values_len(ld->link, resultentry->data, attribute)) == NULL) {
- php_error(E_WARNING, "%s(): Cannot get the value(s) of attribute %s", get_active_function_name(TSRMLS_C), ldap_err2string(_get_lderrno(ld->link)));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot get the value(s) of attribute %s", ldap_err2string(_get_lderrno(ld->link)));
RETURN_FALSE;
}
num_values = ldap_count_values_len(ldap_value_len);
- if (array_init(return_value) == FAILURE) {
- php_error(E_ERROR, "%s(): Cannot initialize return value", get_active_function_name(TSRMLS_C));
- RETURN_FALSE;
- }
+ array_init(return_value);
for (i=0; i<num_values; i++) {
add_next_index_stringl(return_value, ldap_value_len[i]->bv_val, ldap_value_len[i]->bv_len, 1);
Get the DN of a result entry */
PHP_FUNCTION(ldap_get_dn)
{
- pval **link, **result_entry;
+ zval **link, **result_entry;
ldap_linkdata *ld;
ldap_resultentry *resultentry;
char *text;
ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, result_entry, -1, "ldap result entry", le_result_entry);
text = ldap_get_dn(ld->link, resultentry->data);
- if ( text != NULL ) {
+ if (text != NULL) {
RETVAL_STRING(text, 1);
-#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP || WINDOWS
+#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || WINDOWS
ldap_memfree(text);
#else
free(text);
Splits DN into its component parts */
PHP_FUNCTION(ldap_explode_dn)
{
- pval **dn, **with_attrib;
+ zval **dn, **with_attrib;
char **ldap_value;
int i, count;
}
i=0;
- while(ldap_value[i] != NULL) i++;
+ while (ldap_value[i] != NULL) i++;
count = i;
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ array_init(return_value);
add_assoc_long(return_value, "count", count);
- for(i=0; i<count; i++) {
+ for (i = 0; i<count; i++) {
add_index_string(return_value, i, ldap_value[i], 1);
}
Convert DN to User Friendly Naming format */
PHP_FUNCTION(ldap_dn2ufn)
{
- pval **dn;
+ zval **dn;
char *ufn;
if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &dn)==FAILURE) {
if (ufn !=NULL) {
RETVAL_STRING(ufn, 1);
-#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP || WINDOWS
+#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || WINDOWS
ldap_memfree(ufn);
#endif
} else {
/* }}} */
-/* added to fix use of ldap_modify_add for doing an ldap_add, gerrit thomson. */
+/* added to fix use of ldap_modify_add for doing an ldap_add, gerrit thomson. */
#define PHP_LD_FULL_ADD 0xff
/* {{{ php_ldap_do_modify
*/
static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper)
{
- pval **link, **dn, **entry, **value, **ivalue;
+ zval **link, **dn, **entry, **value, **ivalue;
ldap_linkdata *ld;
char *ldap_dn;
LDAPMod **ldap_mods;
}
if (Z_TYPE_PP(entry) != IS_ARRAY) {
- php_error(E_WARNING, "%s(): Expected Array as the last element", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected Array as the last element");
RETURN_FALSE;
}
zend_hash_internal_pointer_reset(Z_ARRVAL_PP(entry));
/* added by gerrit thomson to fix ldap_add using ldap_mod_add */
- if ( oper == PHP_LD_FULL_ADD ) {
+ if (oper == PHP_LD_FULL_ADD) {
oper = LDAP_MOD_ADD;
is_full_add = 1;
}
/* end additional , gerrit thomson */
- for(i=0; i<num_attribs; i++) {
+ for (i = 0; i < num_attribs; i++) {
ldap_mods[i] = emalloc(sizeof(LDAPMod));
ldap_mods[i]->mod_op = oper | LDAP_MOD_BVALUES;
if (zend_hash_get_current_key(Z_ARRVAL_PP(entry), &attribute, &index, 0) == HASH_KEY_IS_STRING) {
ldap_mods[i]->mod_type = estrdup(attribute);
} else {
- php_error(E_WARNING, "%s(): Unknown attribute in the data", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown attribute in the data");
/* Free allocated memory */
while (i >= 0) {
efree(ldap_mods[i--]);
ldap_mods[i]->mod_bvalues[0]->bv_len = Z_STRLEN_PP(value);
ldap_mods[i]->mod_bvalues[0]->bv_val = Z_STRVAL_PP(value);
} else {
- for(j=0; j < num_values; j++) {
+ for (j = 0; j < num_values; j++) {
if (zend_hash_index_find(Z_ARRVAL_PP(value), j, (void **) &ivalue) == FAILURE) {
- php_error(E_WARNING, "%s(): Value array must have consecutive indices 0, 1, ...", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Value array must have consecutive indices 0, 1, ...");
num_berval[i] = j;
num_attribs = i + 1;
RETVAL_FALSE;
/* check flag to see if do_mod was called to perform full add , gerrit thomson */
if (is_full_add == 1) {
if ((i = ldap_add_s(ld->link, ldap_dn, ldap_mods)) != LDAP_SUCCESS) {
- php_error(E_WARNING, "%s(): Add: %s", get_active_function_name(TSRMLS_C), ldap_err2string(i));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Add: %s", ldap_err2string(i));
RETVAL_FALSE;
} else RETVAL_TRUE;
} else {
if ((i = ldap_modify_s(ld->link, ldap_dn, ldap_mods)) != LDAP_SUCCESS) {
- php_error(E_WARNING, "%s(): Modify: %s", get_active_function_name(TSRMLS_C), ldap_err2string(i));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Modify: %s", ldap_err2string(i));
RETVAL_FALSE;
} else RETVAL_TRUE;
}
errexit:
- for(i=0; i < num_attribs; i++) {
+ for (i = 0; i < num_attribs; i++) {
efree(ldap_mods[i]->mod_type);
- for(j=0; j<num_berval[i]; j++) {
+ for (j = 0; j < num_berval[i]; j++) {
efree(ldap_mods[i]->mod_bvalues[j]);
}
efree(ldap_mods[i]->mod_bvalues);
Delete attribute values */
PHP_FUNCTION(ldap_mod_del)
{
- php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_DELETE);
+ php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_DELETE);
}
/* }}} */
Delete an entry from a directory */
PHP_FUNCTION(ldap_delete)
{
- pval **link, **dn;
+ zval **link, **dn;
ldap_linkdata *ld;
char *ldap_dn;
int rc;
ldap_dn = Z_STRVAL_PP(dn);
if ((rc = ldap_delete_s(ld->link, ldap_dn)) != LDAP_SUCCESS) {
- php_error(E_WARNING, "%s(): Delete: %s", get_active_function_name(TSRMLS_C), ldap_err2string(rc));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Delete: %s", ldap_err2string(rc));
RETURN_FALSE;
}
Get the current ldap error number */
PHP_FUNCTION(ldap_errno)
{
- pval **link;
+ zval **link;
ldap_linkdata *ld;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(ht, &link) == FAILURE) {
ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
- RETURN_LONG( _get_lderrno(ld->link) );
+ RETURN_LONG(_get_lderrno(ld->link));
}
/* }}} */
{
zval **perrno;
- if ( ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(ht, &perrno) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(ht, &perrno) == FAILURE) {
WRONG_PARAM_COUNT;
}
Get the current ldap error string */
PHP_FUNCTION(ldap_error)
{
- pval **link;
+ zval **link;
ldap_linkdata *ld;
int ld_errno;
Determine if an entry has a specific value for one of its attributes */
PHP_FUNCTION(ldap_compare)
{
- pval **link, **dn, **attr, **value;
+ zval **link, **dn, **attr, **value;
char *ldap_dn, *ldap_attr, *ldap_value;
ldap_linkdata *ld;
int errno;
errno = ldap_compare_s(ld->link, ldap_dn, ldap_attr, ldap_value);
- switch(errno) {
- case LDAP_COMPARE_TRUE :
+ switch (errno) {
+ case LDAP_COMPARE_TRUE:
RETURN_TRUE;
- break;
+ break;
- case LDAP_COMPARE_FALSE :
+ case LDAP_COMPARE_FALSE:
RETURN_FALSE;
- break;
+ break;
}
- php_error(E_WARNING, "%s(): Compare: %s", get_active_function_name(TSRMLS_C), ldap_err2string(errno));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Compare: %s", ldap_err2string(errno));
RETURN_LONG(-1);
}
ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
if (zend_hash_index_find(&EG(regular_list), Z_LVAL_P(result), (void **) &le) == FAILURE || le->type != le_result) {
- php_error(E_WARNING, "%s(): Supplied resource is not a valid ldap result resource", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Supplied resource is not a valid ldap result resource");
RETURN_FALSE;
}
if (ldap_sort_entries(ld->link, (LDAPMessage **) &le->ptr, sflen ? sortfilter : NULL, strcmp) != LDAP_SUCCESS) {
- php_error(E_WARNING, "%s(): %s", get_active_function_name(TSRMLS_C), ldap_err2string(errno));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ldap_err2string(errno));
RETURN_FALSE;
}
/* }}} */
-#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP
+#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP
/* {{{ proto bool ldap_get_option(resource link, int option, mixed retval)
Get the current value of various session-wide parameters */
PHP_FUNCTION(ldap_get_option)
{
- pval **link, **option, **retval;
+ zval **link, **option, **retval;
ldap_linkdata *ld;
int opt;
- if (ZEND_NUM_ARGS() != 3 ||
- zend_get_parameters_ex(3, &link, &option, &retval) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &link, &option, &retval) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(option);
opt = Z_LVAL_PP(option);
- switch(opt) {
- /* options with int value */
+ switch (opt) {
+ /* options with int value */
case LDAP_OPT_DEREF:
case LDAP_OPT_SIZELIMIT:
case LDAP_OPT_TIMELIMIT:
zval_dtor(*retval);
ZVAL_LONG(*retval, val);
} break;
- /* options with string value */
+ /* options with string value */
case LDAP_OPT_HOST_NAME:
case LDAP_OPT_ERROR_STRING:
#ifdef LDAP_OPT_MATCHED_DN
Set the value of various session-wide parameters */
PHP_FUNCTION(ldap_set_option)
{
- pval **link, **option, **newval;
+ zval **link, **option, **newval;
ldap_linkdata *ld;
LDAP *ldap;
int opt;
- if (ZEND_NUM_ARGS() != 3 ||
- zend_get_parameters_ex(3, &link, &option, &newval) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &link, &option, &newval) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(option);
opt = Z_LVAL_PP(option);
- switch(opt) {
+ switch (opt) {
/* options with int value */
case LDAP_OPT_DEREF:
case LDAP_OPT_SIZELIMIT:
char error=0;
if ((Z_TYPE_PP(newval) != IS_ARRAY) || !(ncontrols = zend_hash_num_elements(Z_ARRVAL_PP(newval)))) {
- php_error(E_WARNING, "%s(): Expected non-empty array value for this option", get_active_function_name(TSRMLS_C));
- RETURN_FALSE;
- }
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected non-empty array value for this option");
+ RETURN_FALSE;
+ }
ctrls = safe_emalloc((1 + ncontrols), sizeof(*ctrls), 0);
*ctrls = NULL;
ctrlp = ctrls;
zend_hash_internal_pointer_reset(Z_ARRVAL_PP(newval));
while (zend_hash_get_current_data(Z_ARRVAL_PP(newval), (void**)&ctrlval) == SUCCESS) {
if (Z_TYPE_PP(ctrlval) != IS_ARRAY) {
- php_error(E_WARNING, "%s(): The array value must contain only arrays, where each array is a control", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "The array value must contain only arrays, where each array is a control");
error = 1;
break;
}
if (zend_hash_find(Z_ARRVAL_PP(ctrlval), "oid", sizeof("oid"), (void **) &val) == FAILURE) {
- php_error(E_WARNING, "%s(): Control must have an oid key", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Control must have an oid key");
error = 1;
break;
}
error = ldap_set_option(ldap, opt, ctrls);
}
ctrlp = ctrls;
- while ( *ctrlp ) {
+ while (*ctrlp) {
efree(*ctrlp);
ctrlp++;
}
Extract information from result */
PHP_FUNCTION(ldap_parse_result)
{
- pval **link, **result, **errcode, **matcheddn, **errmsg, **referrals;
+ zval **link, **result, **errcode, **matcheddn, **errmsg, **referrals;
ldap_linkdata *ld;
LDAPMessage *ldap_result;
char **lreferrals, **refp;
char *lmatcheddn, *lerrmsg;
int rc, lerrcode, myargcount = ZEND_NUM_ARGS();
-
+
if (myargcount < 3 || myargcount > 6 || zend_get_parameters_ex(myargcount, &link, &result, &errcode, &matcheddn, &errmsg, &referrals) == FAILURE) {
WRONG_PARAM_COUNT;
}
ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, result, -1, "ldap result", le_result);
- rc = ldap_parse_result( ld->link, ldap_result, &lerrcode,
+ rc = ldap_parse_result(ld->link, ldap_result, &lerrcode,
myargcount > 3 ? &lmatcheddn : NULL,
myargcount > 4 ? &lerrmsg : NULL,
myargcount > 5 ? &lreferrals : NULL,
NULL /* &serverctrls */,
- 0 );
- if (rc != LDAP_SUCCESS ) {
- php_error(E_WARNING, "%s(): Unable to parse result: %s", get_active_function_name(TSRMLS_C), ldap_err2string(rc));
+ 0);
+ if (rc != LDAP_SUCCESS) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to parse result: %s", ldap_err2string(rc));
RETURN_FALSE;
}
ZVAL_LONG(*errcode, lerrcode);
/* Reverse -> fall through */
- switch(myargcount) {
- case 6 :
+ switch (myargcount) {
+ case 6:
zval_dtor(*referrals);
- if (array_init(*referrals) == FAILURE) {
- php_error(E_ERROR, "%s(): Cannot initialize return value", get_active_function_name(TSRMLS_C));
- ldap_value_free(lreferrals);
- ldap_memfree(lerrmsg);
- ldap_memfree(lmatcheddn);
- RETURN_FALSE;
- }
+ array_init(*referrals);
if (lreferrals != NULL) {
refp = lreferrals;
while (*refp) {
}
ldap_value_free(lreferrals);
}
- case 5 :
+ case 5:
zval_dtor(*errmsg);
if (lerrmsg == NULL) {
ZVAL_EMPTY_STRING(*errmsg);
ZVAL_STRING(*errmsg, lerrmsg, 1);
ldap_memfree(lerrmsg);
}
- case 4 :
+ case 4:
zval_dtor(*matcheddn);
if (lmatcheddn == NULL) {
ZVAL_EMPTY_STRING(*matcheddn);
Return first reference */
PHP_FUNCTION(ldap_first_reference)
{
- pval **link, **result;
+ zval **link, **result;
ldap_linkdata *ld;
ldap_resultentry *resultentry;
LDAPMessage *ldap_result, *entry;
Get next reference */
PHP_FUNCTION(ldap_next_reference)
{
- pval **link, **result_entry;
+ zval **link, **result_entry;
ldap_linkdata *ld;
ldap_resultentry *resultentry, *resultentry_next;
LDAPMessage *entry_next;
Extract information from reference entry */
PHP_FUNCTION(ldap_parse_reference)
{
- pval **link, **result_entry, **referrals;
+ zval **link, **result_entry, **referrals;
ldap_linkdata *ld;
ldap_resultentry *resultentry;
char **lreferrals, **refp;
}
zval_dtor(*referrals);
- if (array_init(*referrals) == FAILURE) {
- php_error(E_ERROR, "%s(): Cannot initialize return value", get_active_function_name(TSRMLS_C));
- ldap_value_free(lreferrals);
- RETURN_FALSE;
- }
+ array_init(*referrals);
if (lreferrals != NULL) {
refp = lreferrals;
while (*refp) {
Modify the name of an entry */
PHP_FUNCTION(ldap_rename)
{
- pval **link, **dn, **newrdn, **newparent, **deleteoldrdn;
+ zval **link, **dn, **newrdn, **newparent, **deleteoldrdn;
ldap_linkdata *ld;
int rc;
convert_to_string_ex(newparent);
convert_to_boolean_ex(deleteoldrdn);
-#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP
+#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP
rc = ldap_rename_s(ld->link, Z_STRVAL_PP(dn), Z_STRVAL_PP(newrdn), Z_STRVAL_PP(newparent), Z_BVAL_PP(deleteoldrdn), NULL, NULL);
#else
if (Z_STRLEN_PP(newparent) != 0) {
- php_error(E_WARNING, "%s(): You are using old LDAP API, newparent must be the empty string, can only modify RDN", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "You are using old LDAP API, newparent must be the empty string, can only modify RDN");
RETURN_FALSE;
}
/* could support old APIs but need check for ldap_modrdn2()/ldap_modrdn() */
Start TLS */
PHP_FUNCTION(ldap_start_tls)
{
- pval **link;
+ zval **link;
ldap_linkdata *ld;
- int rc;
+ int rc, protocol = LDAP_VERSION3;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &link) == FAILURE) {
WRONG_PARAM_COUNT;
ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
- if ((rc = ldap_start_tls_s(ld->link, NULL, NULL)) != LDAP_SUCCESS) {
- php_error(E_WARNING,"%s(): Unable to start TLS: %s", get_active_function_name(TSRMLS_C), ldap_err2string(rc));
+ if (((rc = ldap_set_option(ld->link, LDAP_OPT_PROTOCOL_VERSION, &protocol)) != LDAP_SUCCESS) ||
+ ((rc = ldap_start_tls_s(ld->link, NULL, NULL)) != LDAP_SUCCESS)
+ ) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"Unable to start TLS: %s", ldap_err2string(rc));
RETURN_FALSE;
} else {
RETURN_TRUE;
}
/* }}} */
#endif
-#endif /* ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP */
-
+#endif /* (LDAP_API_VERSION > 2000) || HAVE_NSLDAP */
#if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC)
-int _ldap_rebind_proc(LDAP *ldap, const char *url, ber_tag_t req, ber_int_t msgid, void *params) {
+/* {{{ proto _ldap_rebind_proc()
+*/
+int _ldap_rebind_proc(LDAP *ldap, const char *url, ber_tag_t req, ber_int_t msgid, void *params)
+{
ldap_linkdata *ld;
int retval;
zval *cb_url;
/* link exists and callback set? */
if (ld == NULL || ld->rebindproc == NULL) {
- php_error(E_WARNING, "%s(): Link not found or no callback set", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Link not found or no callback set");
return LDAP_OTHER;
}
/* callback */
MAKE_STD_ZVAL(cb_url);
- ZVAL_STRING(cb_url, estrdup(url), 0);
+ ZVAL_STRING(cb_url, estrdup(url), 0);
cb_args[0] = &cb_link;
cb_args[1] = &cb_url;
if (call_user_function_ex(EG(function_table), NULL, ld->rebindproc, &cb_retval, 2, cb_args, 0, NULL TSRMLS_CC) == SUCCESS && cb_retval) {
retval = Z_LVAL_P(cb_retval);
zval_ptr_dtor(&cb_retval);
} else {
- php_error(E_WARNING, "%s(): rebind_proc PHP callback failed", get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "rebind_proc PHP callback failed");
retval = LDAP_OTHER;
}
zval_dtor(cb_url);
FREE_ZVAL(cb_url);
return retval;
}
-
+/* }}} */
/* {{{ proto bool ldap_set_rebind_proc(resource link, string callback)
Set a callback function to do re-binds on referral chasing. */
/* callable? */
if (!zend_is_callable(callback, 0, &callback_name)) {
- php_error(E_WARNING, "%s(): Two arguments expected for '%s' to be a valid callback", get_active_function_name(TSRMLS_C), callback_name);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Two arguments expected for '%s' to be a valid callback", callback_name);
efree(callback_name);
RETURN_FALSE;
}
zval_copy_ctor(ld->rebindproc);
RETURN_TRUE;
}
+/* }}} */
#endif
-
#ifdef STR_TRANSLATION
/* {{{ php_ldap_do_translate
*/
ldap_buf = Z_STRVAL_PP(value);
ldap_len = Z_STRLEN_PP(value);
- if(ldap_len == 0) {
+ if (ldap_len == 0) {
RETURN_FALSE;
}
- if(way == 1) {
+ if (way == 1) {
result = ldap_8859_to_t61(&ldap_buf, &ldap_len, 0);
} else {
result = ldap_t61_to_8859(&ldap_buf, &ldap_len, 0);
RETVAL_STRINGL(ldap_buf, ldap_len, 1);
free(ldap_buf);
} else {
- php_error(E_WARNING, "%s(): Conversion from iso-8859-1 to t61 failed: %s", get_active_function_name(TSRMLS_C), ldap_err2string(result));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Conversion from iso-8859-1 to t61 failed: %s", ldap_err2string(result));
RETVAL_FALSE;
}
projects / php / commitdiff