diff options
| author | Côme Bernigaud <mcmic@php.net> | 2015-07-06 14:56:20 +0200 |
|---|---|---|
| committer | Côme Bernigaud <mcmic@php.net> | 2015-07-06 14:56:20 +0200 |
| commit | da6e286dbbdc067c5583cd9a29bafc6457d640cc (patch) | |
| tree | f1702ce961136e3e4d54722599adee7f45ef60f2 | |
| parent | a09dcb0e13b809a8d8c646aff8449782d3b9ca18 (diff) | |
| parent | 022068342b5da0b97be1b5f3bb7b018263bd6437 (diff) | |
| download | php-git-da6e286dbbdc067c5583cd9a29bafc6457d640cc.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Attempt at falling back on ldap_find_control for Mac OS
| -rw-r--r-- | ext/ldap/config.m4 | 2 | ||||
| -rw-r--r-- | ext/ldap/ldap.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4 index 036d1d3559..947cebca33 100644 --- a/ext/ldap/config.m4 +++ b/ext/ldap/config.m4 @@ -204,7 +204,7 @@ if test "$PHP_LDAP" != "no"; then 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_result ldap_parse_reference ldap_start_tls_s]) + AC_CHECK_FUNCS([ldap_parse_result ldap_parse_reference ldap_start_tls_s ldap_control_find]) dnl dnl SASL check diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index b4931424ed..dbcd2d4ea5 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -70,6 +70,14 @@ #define PHP_LDAP_ESCAPE_FILTER 0x01 #define PHP_LDAP_ESCAPE_DN 0x02 +#ifndef HAVE_LDAP_CONTROL_FIND +LDAPControl *ldap_control_find( const char *oid, LDAPControl **ctrls, LDAPControl ***nextctrlp) +{ + assert(nextctrlp == NULL); + return ldap_find_control(oid, ctrls); +} +#endif + typedef struct { LDAP *link; #if defined(HAVE_3ARG_SETREBINDPROC) |