Skip to content

ext/ldap parameter fixes #6153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 16 commits into from
Closed

ext/ldap parameter fixes #6153

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0dfede7
Make URI parameter in ldap_connect default to NULL
Sep 17, 2020
a4b7df5
Default bind dn and password to NULL in ldap_bind
Sep 17, 2020
8667f5c
Default bind dn and password to NULL in ldap_bind_ext
Sep 17, 2020
d2645cb
Set all parameters to ldap_sasl_bind as NULL by default
Sep 17, 2020
cd38890
Remove dummy_ber parameter from ldap_first_attribute and ldap_next_at…
Sep 17, 2020
d2e13e3
Fix "null" case in ldap.stub.php
Sep 17, 2020
1b828b8
Fix parameter names in ext/ldap
Sep 17, 2020
e2f91d6
Fix parameter mask in ldap_next_attribute
MCMic Sep 17, 2020
79f0efe
Explicitely mark nullable strings
Sep 21, 2020
6141ba8
Improve parameter naming in ldap_set_option ext/ldap/ldap.stub.php
MCMic Sep 28, 2020
7c4e1aa
Improve parameter naming in ldap_connect
MCMic Sep 28, 2020
998814a
Improve parameter naming in ldap_exop_passwd
MCMic Sep 28, 2020
104fef4
Improve parameter naming in ldap_rename
MCMic Sep 28, 2020
2cf6e24
Rename $link parameters to $ldap in ldap functions
Sep 28, 2020
36830f6
Harmonize ldap_rename_ext with ldap_rename parameter names
MCMic Sep 28, 2020
ac12ce1
Improve parameter names in ext/ldap
Sep 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions ext/ldap/ldap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,15 +1001,15 @@ PHP_FUNCTION(ldap_connect)
WRONG_PARAM_COUNT;
}

if (zend_parse_parameters(ZEND_NUM_ARGS(), "|slssl", &host, &hostlen, &port, &wallet, &walletlen, &walletpasswd, &walletpasswdlen, &authmode) != SUCCESS) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!lssl", &host, &hostlen, &port, &wallet, &walletlen, &walletpasswd, &walletpasswdlen, &authmode) != SUCCESS) {
RETURN_THROWS();
}

if (ZEND_NUM_ARGS() == 5) {
ssl = 1;
}
#else
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|sl", &host, &hostlen, &port) != SUCCESS) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!l", &host, &hostlen, &port) != SUCCESS) {
RETURN_THROWS();
}
#endif
Expand Down Expand Up @@ -1119,7 +1119,7 @@ PHP_FUNCTION(ldap_bind)
ldap_linkdata *ld;
int rc;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|ss", &link, &ldap_bind_dn, &ldap_bind_dnlen, &ldap_bind_pw, &ldap_bind_pwlen) != SUCCESS) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!s!", &link, &ldap_bind_dn, &ldap_bind_dnlen, &ldap_bind_pw, &ldap_bind_pwlen) != SUCCESS) {
RETURN_THROWS();
}

Expand Down Expand Up @@ -1175,7 +1175,7 @@ PHP_FUNCTION(ldap_bind_ext)
LDAPMessage *ldap_res;
int rc;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|ssa", &link, &ldap_bind_dn, &ldap_bind_dnlen, &ldap_bind_pw, &ldap_bind_pwlen, &serverctrls) != SUCCESS) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!s!a", &link, &ldap_bind_dn, &ldap_bind_dnlen, &ldap_bind_pw, &ldap_bind_pwlen, &serverctrls) != SUCCESS) {
RETURN_THROWS();
}

Expand Down Expand Up @@ -1337,7 +1337,7 @@ PHP_FUNCTION(ldap_sasl_bind)
size_t rc, dn_len, passwd_len, mech_len, realm_len, authc_id_len, authz_id_len, props_len;
php_ldap_bictx *ctx;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|sssssss", &link, &binddn, &dn_len, &passwd, &passwd_len, &sasl_mech, &mech_len, &sasl_realm, &realm_len, &sasl_authc_id, &authc_id_len, &sasl_authz_id, &authz_id_len, &props, &props_len) != SUCCESS) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!s!s!s!s!s!s!", &link, &binddn, &dn_len, &passwd, &passwd_len, &sasl_mech, &mech_len, &sasl_realm, &realm_len, &sasl_authc_id, &authc_id_len, &sasl_authz_id, &authz_id_len, &props, &props_len) != SUCCESS) {
RETURN_THROWS();
}

Expand Down Expand Up @@ -1601,12 +1601,12 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
}

if (!base_dn_str) {
zend_argument_type_error(2, "must be of type string when argument #1 ($link_identifier) is a resource");
zend_argument_type_error(2, "must be of type string when argument #1 ($ldap) is a resource");
}
ldap_base_dn = zend_string_copy(base_dn_str);

if (!filter_str) {
zend_argument_type_error(3, "must be of type string when argument #1 ($link_identifier) is a resource");
zend_argument_type_error(3, "must be of type string when argument #1 ($ldap) is a resource");
}
ldap_filter = zend_string_copy(filter_str);

Expand Down Expand Up @@ -1909,9 +1909,8 @@ PHP_FUNCTION(ldap_first_attribute)
ldap_linkdata *ld;
ldap_resultentry *resultentry;
char *attribute;
zend_long dummy_ber;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr|l", &link, &result_entry, &dummy_ber) != SUCCESS) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr", &link, &result_entry) != SUCCESS) {
RETURN_THROWS();
}

Expand Down Expand Up @@ -1941,9 +1940,8 @@ PHP_FUNCTION(ldap_next_attribute)
ldap_linkdata *ld;
ldap_resultentry *resultentry;
char *attribute;
zend_long dummy_ber;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr|l", &link, &result_entry, &dummy_ber) != SUCCESS) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr", &link, &result_entry) != SUCCESS) {
RETURN_THROWS();
}

Expand Down
Loading