Côme Chilliet
5691d8bf49
Added controls support to ldap_exop
2017-09-21 10:05:40 +02:00
Côme Chilliet
8de071e0f7
Added controls support to ldap_search, ldap_list and ldap_read.
2017-09-21 10:05:40 +02:00
Côme Chilliet
5ccb31e49e
Added controls support to ldap_parse_result and ldap_exop_passwd
...
Known controls are parsed to and from associative arrays.
Only ppolicy and paged results are implemented for now.
2017-09-21 10:05:40 +02:00
Côme Chilliet
26ccaa39b3
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Removing client controls attribute from ldap_exop signature
2017-09-07 16:33:42 +02:00
Côme Chilliet
e67379399a
Removing client controls attribute from ldap_exop signature
...
Client controls will not get implemented in php-ldap as
they are specific to each client ldap lib and most of the
time unused any way. (servers controls on the other end are used
and will get implemented)
2017-09-07 16:31:03 +02:00
Côme Chilliet
28630f7920
Fixed an error in ldap_exop introduced by last commit
2017-09-06 15:05:27 +02:00
Côme Chilliet
3fdeb27739
Improving a bit code quality in ldap_exop function
...
Ideas from 5b3f4c2fb9
The same can be done for the rest of the code,
and synchronous/asynchronous version should be merged when implementing
controls.
2017-09-06 12:56:51 +02:00
Côme Chilliet
f3f25a8446
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Added controls parameters to ldap_exop so that control support can be added later
2017-08-04 18:11:52 +02:00
Côme Chilliet
aa0e402acf
Added controls parameters to ldap_exop so that control support can be added later
2017-08-04 18:10:49 +02:00
Côme Chilliet
afef1fe778
Fixed ldap tests when ldap server hash out passwords
2017-07-26 17:34:18 +02:00
Côme Chilliet
d51c4cd64f
Fixed test for ldap_set_option server controls with empty array
2017-07-26 17:21:27 +02:00
Anatol Belski
572429473d
Fix datatypes and warnings
...
Needs more testing yet.
use size_t
add range check and fix warning
more size_t fixes
2017-07-25 19:03:33 +02:00
Côme Chilliet
5e56d050e5
Added ldap_exop_refresh helper for EXOP REFRESH operation on dds overlay
...
ldap_exop_refresh(resource link, string dn, int ttl)
Returns FALSE on failure, newttl on success
2017-07-20 16:16:59 +02:00
Côme Chilliet
a3b42ea96b
Using LDAP_CONTROL_MANAGEDSAIT constant in ldap tests instead of string oid
2017-07-20 12:37:44 +02:00
Côme Chilliet
a148ee8c7c
Fixed removing all controls by passing an empty array to ldap_set_option
2017-07-11 16:18:33 +02:00
Côme Chilliet
ed8bfcc6ea
Small fix in ext/ldap, Moved vars definitions to the beginning of the block using them
2017-07-10 11:33:08 +02:00
Côme Chilliet
274d84139b
Added constants for known ldap controls OID and tests for ldap_get/set_option for controls
...
Also fixed existing tests which were expecting ldap_get_option to fail on controls
2017-07-05 16:41:52 +02:00
Côme Chilliet
3a09c1246c
Added support for controls to ldap_get_option
2017-07-05 16:41:52 +02:00
Côme Chilliet
209c9ba384
Test ldap_exop_passwd with less parameters to be sure it works
2017-07-04 10:17:41 +02:00
Côme Chilliet
3207747b9e
Changed API to avoid using passing result by reference
...
See discussion on internals ML
2017-07-04 10:03:27 +02:00
Côme Chilliet
13062efd02
Removed unused variables left over by LDAP EXOP patch
2017-07-03 12:23:34 +02:00
Côme Chilliet
e05d230e52
Removed TSRMLS_CC instances left over by LDAP EXOP patch
2017-07-03 12:08:24 +02:00
Côme Chilliet
bda80aa332
Swapped position of retoid and retdata as retoid is almost never used
2017-07-03 10:58:13 +02:00
Côme Chilliet
e9001cab46
Removed two step syntax for EXOP helpers, one call workflow is enough
2017-07-03 10:58:13 +02:00
Côme Chilliet
5020325a6f
Improved ldap_exop test to encode&decode a passwd EXOP to test sending/recieving data
2017-07-03 10:58:13 +02:00
Côme Chilliet
413e9c84f6
Removed TODOs regarding implementing passwd and whoami exops based on ldap_exop
2017-07-03 10:58:13 +02:00
Côme Chilliet
9aa99cc34c
Added constants for standard EXOPs
2017-07-03 10:58:13 +02:00
Côme Chilliet
4652c46245
Removed ldap_refresh function as I’m not sure how to fix/use/test it
2017-07-03 10:58:13 +02:00
Côme Chilliet
e832ce4b22
Fixed ldap_exop and ldap_parse_exop. Only tested them for whoami exop. (see test file)
2017-07-03 10:58:13 +02:00
Côme Chilliet
28530b2f1c
Fixed ldap_parse_exop_whoami and ldap_parse_exop_passwd and added test for them
2017-07-03 10:58:13 +02:00
Côme Chilliet
fdafd68419
Fixed ldap_exop_whoami and added a test for it
2017-07-03 10:58:12 +02:00
Côme Chilliet
ae76c8ba2c
Fixed ldap_exop_passwd and added tests for it
2017-07-03 10:58:12 +02:00
Côme Chilliet
def09c7cab
Fixed building errors in LDAP EXOP
2017-07-03 10:58:12 +02:00
Côme Chilliet
a0920f2822
Added EXOP features based on patch from http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/databases/php-ldap/files/ldap-ctrl-exop56.patch
2017-07-03 10:58:12 +02:00
Nikita Popov
035a27cbc6
Only compute callback name in error cases
...
Mostly the callback name is only used to report an error. Try to
avoid calculating it if no error occurred.
2017-06-25 18:45:59 +02:00
David Caldwell
aef09760d1
ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap)
2017-05-30 17:30:32 +02:00
David Caldwell
747e93eabc
ext/ldap: Allow default host from ldap.conf to work.
...
This fixes an regression introduced in
e7af0fe1eb
. Previously, calling
ldap_connect() with no parameters would pass NULL to ldap_init(),
which causes it to use the default host specified in
/etc/ldap/ldap.conf (on Ubuntu).
When the code changed to use ldap_initialize(), it initialized a uri,
even if there were no parameters passed to ldap_connect(). Because of
this, there's no way to pass a NULL into ldap_initialize(), making it
impossible to use the default uri from ldap.conf.
This commit bypasses the uri creation when there is no host argument,
passing on a NULL to ldap_initialize() which restores the old PHP 5.5
behavior.
2017-05-30 17:30:32 +02:00
Côme Bernigaud
1bb295e659
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap)
ext/ldap: Allow default host from ldap.conf to work.
Conflicts:
ext/ldap/ldap.c
2017-05-30 16:48:16 +02:00
David Caldwell
49d1cdc393
ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap)
2017-05-25 21:27:11 +00:00
David Caldwell
d51b8f915f
ext/ldap: Allow default host from ldap.conf to work.
...
This fixes an regression introduced in
e7af0fe1eb
. Previously, calling
ldap_connect() with no parameters would pass NULL to ldap_init(),
which causes it to use the default host specified in
/etc/ldap/ldap.conf (on Ubuntu).
When the code changed to use ldap_initialize(), it initialized a uri,
even if there were no parameters passed to ldap_connect(). Because of
this, there's no way to pass a NULL into ldap_initialize(), making it
impossible to use the default uri from ldap.conf.
This commit bypasses the uri creation when there is no host argument,
passing on a NULL to ldap_initialize() which restores the old PHP 5.5
behavior.
2017-05-25 00:47:11 +00:00
Xinchen Hui
0311dc8697
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed another part in ldap (bug #73933 )
2017-01-19 12:24:04 +08:00
Xinchen Hui
5e09031144
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed another part in ldap (bug #73933 )
2017-01-19 12:23:56 +08:00
Xinchen Hui
cad2598fcb
Fixed another part in ldap (bug #73933 )
2017-01-19 12:23:23 +08:00
Xinchen Hui
fafce65a05
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Update NEWS
Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)
2017-01-17 15:35:46 +08:00
Xinchen Hui
e180e45a18
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)
2017-01-17 15:35:06 +08:00
Xinchen Hui
b28c2e20ca
Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)
2017-01-17 15:34:19 +08:00
Anatol Belski
97ac819c2b
Merge branch 'PHP-7.1'
...
* PHP-7.1:
move various places to the centralized OpenSSL setup routine
use the new API for opaque symbol in OpenSSL 1.1.x
implement basic config support for OpenSSL 1.1.x
2017-01-08 00:39:53 +01:00
Anatol Belski
43b92ed5a8
move various places to the centralized OpenSSL setup routine
2017-01-08 00:25:47 +01:00
Joe Watkins
00062d2ea8
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Adapts the readme to the new test-possibility
2017-01-07 16:46:18 +00:00
Joe Watkins
201e56cd04
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Adapts the readme to the new test-possibility
2017-01-07 16:46:01 +00:00
Andreas Heigl
fc777296bf
Adapts the readme to the new test-possibility
...
This commit introduces a way to use a vagrant setup to test against a
known LDAP without the need to setup an LDAP on your own machine
2017-01-07 16:45:10 +00:00
Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
Sammy Kaye Powers
9e29f841ce
Update copyright headers to 2017
2017-01-02 09:30:12 -06:00
Anatol Belski
b204b3abd1
further normalizations, uint vs uint32_t
...
fix merge mistake
yet one more replacement run
2016-11-26 17:29:01 +01:00
Nikita Popov
5af586bec5
Remove more PHP 6 leftovers from tests
2016-11-24 22:39:39 +01:00
Kalle Sommer Nielsen
2104bea5d7
Remove Netware support
...
If this does not break the Unix system somehow, I'll be amazed. This should get most of it out, apologies for any errors this may cause on non-Windows ends which I cannot test atm.
2016-11-12 11:20:01 +01:00
Stanislav Malyshev
19866fb76c
Fix various int size overflows.
...
Add function for detection of string zvals with length that does not fit
INT_MAX.
2016-09-12 21:04:23 -07:00
Anatol Belski
78c15e2744
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix leak
2016-08-29 18:08:17 +02:00
Anatol Belski
ca4eeedd36
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix leak
2016-08-29 18:05:47 +02:00
Anatol Belski
e2609a38d9
fix leak
2016-08-29 18:01:21 +02:00
Côme Bernigaud
c53aadbba3
Merge branch 'pull-request/1955'
...
* pull-request/1955:
Add parenthesis to if statements
Correctly add to the length of the final string
Correctly add to the length of the final string
Fix minor spacing issue
Make LDAP_ESCAPE_DN compliant with RFC 4514
2016-07-07 05:11:56 +02:00
Aaron Piotrowski
24237027bc
Merge branch 'throw-error-in-extensions'
2016-07-05 02:08:39 -05:00
Chad Sikorra
b1d82607e6
Add parenthesis to if statements
2016-06-29 07:37:48 -05:00
Chad Sikorra
f910ca259f
Correctly add to the length of the final string
2016-06-26 17:29:07 -05:00
Chad Sikorra
e85a2e360c
Correctly add to the length of the final string
2016-06-26 17:10:51 -05:00
Chad Sikorra
737ee1f2c9
Fix minor spacing issue
2016-06-26 09:31:07 -05:00
Chad Sikorra
63427c1768
Make LDAP_ESCAPE_DN compliant with RFC 4514
2016-06-25 21:16:45 -05:00
Côme Bernigaud
355c5954da
Merge branch 'pull-request/1946' into PHP-7.1.0
...
* pull-request/1946:
Add additional LDAP SASL constants
Add tests for LDAP_OPT_* constants
Add LDAP TLS Protocol Min constants
Add tests for the LDAP CRL check option
Add missing LDAP constants
2016-06-23 07:22:40 +02:00
Dmitry Stogov
323b2733f6
Fixed compilation warnings
2016-06-22 00:40:50 +03:00
Dmitry Stogov
1616038698
Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
...
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
2016-06-21 16:00:37 +03:00
Chad Sikorra
4718eb05b4
Add additional LDAP SASL constants
2016-06-16 21:00:32 -05:00
Chad Sikorra
a1f2649048
Add tests for LDAP_OPT_* constants
2016-06-15 23:01:26 -05:00
Chad Sikorra
6415a86c9d
Add LDAP TLS Protocol Min constants
2016-06-15 22:45:38 -05:00
Chad Sikorra
8880367773
Add tests for the LDAP CRL check option
2016-06-15 20:29:39 -05:00
Chad Sikorra
8e9e89610e
Add missing LDAP constants
2016-06-14 23:32:59 -05:00
Aaron Piotrowski
771e5cc247
Replace zend_ce_error with NULL and replace more E_ERROR with thrown Error
2016-06-13 09:02:17 -05:00
Aaron Piotrowski
e3c681aa5c
Merge branch 'master' into throw-error-in-extensions
2016-06-10 22:02:23 -05:00
Anatol Belski
86229f9943
fix SKIPIF sections
2016-03-09 14:28:38 +01:00
Edwin Hoksberg
ba96506676
LDAP - Added support to change the certificates verification
2016-03-01 04:59:30 +01:00
Lior Kaplan
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Xinchen Hui
87958927b0
Fixed bug #71249 (ldap_mod_replace/ldap_mod_add store value as string "Array")
2016-01-01 07:06:58 -08:00
Côme Bernigaud
e6759644ec
Revert "Added back support for undocummented host:port syntax"
...
This reverts commit 15876e85e5
.
2015-11-24 03:45:21 +01:00
Côme Bernigaud
5a8bcf73ba
Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)"
...
This reverts commit 391087ed28
.
2015-11-24 03:45:17 +01:00
Xinchen Hui
9134f9e98f
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/mysql/php_mysql.c
2015-11-16 17:59:46 +08:00
Côme Bernigaud
15876e85e5
Added back support for undocummented host:port syntax
2015-11-16 04:50:12 +01:00
Xinchen Hui
fc611a134b
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-12 14:20:03 +08:00
Côme Bernigaud
391087ed28
Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)
...
Note that passing 0 will also result in default port.
2015-11-12 07:06:05 +01:00
Dmitry Stogov
560e4fa393
Removed or simplified incorrect SEPARATE_*() macros usage.
2015-09-29 11:17:43 +03:00
Dmitry Stogov
719664dec2
fixed compilation error
2015-09-10 20:24:11 +03:00
Xinchen Hui
bb4c0c0703
Merge branch 'PHP-5.6'
2015-09-10 19:56:18 +08:00
Côme Bernigaud
059dd18c37
Added support of LDAP_OPT_TIMEOUT, fixes #69574
2015-09-09 18:02:10 +02:00
Côme Bernigaud
fb9d934d51
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 11:05:29 +02:00
Côme Bernigaud
a483a79c85
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 10:34:46 +02:00
Tyson Andre
c3fc65eb7c
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
...
LDAP_OPT_TIMELIMIT and LDAP_OPT_DEREF's original values weren't
saved properly because of a bug introduced when copy and pasting.
This lead to the original timeout being changed
when specifying a temporary override (e.g. for ldap_search(..., $timeout))
2015-09-08 18:42:02 -07:00
Côme Bernigaud
8acda9cad5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Patch from Rainer Jung to provide Solaris LDAP support
Conflicts:
ext/ldap/ldap.c
2015-08-18 17:26:46 +02:00
Côme Bernigaud
40befb943c
Patch from Rainer Jung to provide Solaris LDAP support
2015-08-18 16:52:44 +02:00
Anatol Belski
91f985b2f9
fix config.w32
2015-07-23 07:39:25 +02:00
Anatol Belski
3d38db3576
fix C99 compat
2015-07-23 07:39:16 +02:00
Anatol Belski
73c0fc0df4
move the define to the right place
...
thanks Kalle )
2015-07-06 19:43:35 +02:00
Aaron Piotrowski
fb4e3085cb
Add missing include
2015-07-06 10:06:47 -05:00
Côme Bernigaud
da6e286dbb
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Attempt at falling back on ldap_find_control for Mac OS
2015-07-06 14:56:20 +02:00
Côme Bernigaud
022068342b
Attempt at falling back on ldap_find_control for Mac OS
2015-07-06 14:54:04 +02:00
Côme Bernigaud
a09dcb0e13
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated README, added test to create LDAP base if missing and ease tests
2015-07-06 14:28:01 +02:00
Côme Bernigaud
42f7e4c044
Updated README, added test to create LDAP base if missing and ease tests
2015-07-06 14:26:49 +02:00
Dmitry Stogov
7a1a499377
Fixed return value
2015-07-06 11:25:19 +03:00
Aaron Piotrowski
7ec1e17464
Update memory freeing and other issues, revert some changes
2015-07-05 23:25:53 -05:00
Aaron Piotrowski
907476f34c
Convert E_ERROR to thrown Error in extensions
2015-07-05 12:16:57 -05:00
Dmitry Stogov
34ec1c96e7
Cleanup (avoid reallocation).
2015-07-01 13:49:57 +03:00
Dmitry Stogov
7aa7627172
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 13:59:27 +03:00
Côme Bernigaud
d554d64f64
Merge branch 'PHP-5.6'
...
* PHP-5.6:
keep LDAP_DEPRECATED in config.w32
2015-06-30 09:31:19 +02:00
Anatol Belski
57525d01dc
keep LDAP_DEPRECATED in config.w32
2015-06-30 09:30:48 +02:00
Dmitry Stogov
6cf6f2c6bf
Merge branch 'PHP-5.6'
...
* PHP-5.6:
On Windows PHP may be restarted with different set of DSO extensions without SHM reset. This may make optimisation for entities from DSO extensions inconsistent.
Putting back deprecated symbols for ldap_sort
Removed deprecated function calls from ldap module
Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
2015-06-29 18:14:14 +03:00
Côme Bernigaud
667e9bd417
Deprecating ldap_sort the right way
2015-06-29 14:31:20 +02:00
Andreas Heigl
6e84f8e95e
Fixes ldap_sort-tests
...
Thanks to Côme Bernigaud for fixing!
2015-06-29 11:11:11 +02:00
Andreas Heigl
85aabd3e85
Adds deprecation-message for ldap_sort
2015-06-29 11:11:11 +02:00
Anatol Belski
07c971b665
keep LDAP_DEPRECATED in config.w32
2015-06-29 10:12:36 +02:00
Côme Bernigaud
d4077410b8
Putting back deprecated symbols for ldap_sort
2015-06-29 09:42:47 +02:00
Côme Bernigaud
0483b6e868
Removed deprecated function calls from ldap module
...
ldap_search -> ldap search_ext
ldap_search_s ->_ldap_search_ext_s
ldap_add_s -> ldap_add_ext_s
ldap_delete_s -> ldap_delete_ext_s
ldap_compare_s -> ldap_compare_ext_s
ldap_value_free -> ldap_memvfree
Only thing left is ldap_sort_entries, no replacement
Conflicts:
ext/ldap/ldap.c
2015-06-29 09:42:47 +02:00
Côme Bernigaud
4f7808ec50
Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
...
Conflicts:
ext/ldap/ldap.c
2015-06-29 09:42:47 +02:00
Côme Bernigaud
2e85e6d3ee
Merge PR about LDAP cleaning by removing deprecated calls
...
Merge branch 'pull-request/1357' into PHP-5.6
* pull-request/1357:
Putting back deprecated symbols for ldap_sort
Removed deprecated function calls from ldap module
Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
2015-06-29 09:31:37 +02:00
Côme Bernigaud
736d840c8b
Putting back deprecated symbols for ldap_sort
2015-06-29 09:07:49 +02:00
Rasmus Lerdorf
41774bceff
Fix more minor mistakes in the proto comments
2015-06-23 15:47:33 -04:00
Côme Bernigaud
5250fc772d
Removed deprecated function calls from ldap module
...
ldap_search -> ldap search_ext
ldap_search_s ->_ldap_search_ext_s
ldap_add_s -> ldap_add_ext_s
ldap_delete_s -> ldap_delete_ext_s
ldap_compare_s -> ldap_compare_ext_s
ldap_value_free -> ldap_memvfree
Only thing left is ldap_sort_entries, no replacement
2015-06-23 16:44:48 +02:00
Côme Bernigaud
d29cc63bb6
Fixed two errors in LDAP tests
2015-06-23 16:11:12 +02:00
Côme Bernigaud
9bcdd2aabe
Fixed two errors in LDAP tests
2015-06-23 16:09:56 +02:00
Côme Bernigaud
ea49be9b37
Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
2015-06-23 15:50:14 +02:00
Andreas Heigl
eb702637a9
Implements extended error messages
...
This commit introduces a new constant that can be used to retrieve more
detailed error messages.
This fixes #47222
The new constant LDAP_OPT_DIAGNOSTIC_MESSAGE is defined in PHP when the
underlying library provides (and understands) it. This is the case in
the current OpenLDAP-implementation.
Tanks to Johnny Willer who provided the solution at http://stackoverflow.com/questions/28765077/get-number-of-ad-errors-with-ldap-and-php-ldap-function-return-unprecise-error/28816473#28816473
2015-06-17 15:39:07 +02:00
Côme Bernigaud
78fe52475f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Replaced calls to deprecated openldap functions
Fixed LDAP tests so that base can exists
Conflicts:
ext/ldap/ldap.c
2015-06-17 15:08:47 +02:00
Côme Bernigaud
e7af0fe1eb
Replaced calls to deprecated openldap functions
...
ldap_unbind_s -> ldap_unbind_ext
389 -> LDAP_PORT
ldap_init -> ldap_initialize
ldap_bind_s -> ldap_sasl_bind_s
ldap_value_free -> ber_memvfree
Also added ldap_is_ldap_url check
2015-06-17 14:36:38 +02:00
Côme Bernigaud
a5629f8845
Fixed LDAP tests so that base can exists
...
Now you can set the base in the env var LDAP_TEST_BASE.
The base has to exists. (before tests were attempting to create/delete
the base itself)
2015-06-17 13:55:13 +02:00
Côme Bernigaud
8836404faf
Fixed LDAP tests so that base can exists
...
Now you can set the base in the env var LDAP_TEST_BASE.
The base has to exists. (before tests were attempting to create/delete
the base itself)
2015-06-17 13:50:14 +02:00
Andreas Heigl
983b101f8e
Implements extended error messages
...
This commit introduces a new constant that can be used to retrieve more
detailed error messages.
This fixes #47222
The new constant LDAP_OPT_DIAGNOSTIC_MESSAGE is defined in PHP when the
underlying library provides (and understands) it. This is the case in
the current OpenLDAP-implementation.
Tanks to Johnny Willer who provided the solution at http://stackoverflow.com/questions/28765077/get-number-of-ad-errors-with-ldap-and-php-ldap-function-return-unprecise-error/28816473#28816473
2015-05-12 10:06:54 +02:00
Dmitry Stogov
b8ba3203e5
Cleanup
2015-04-07 14:19:12 +03:00
Anatol Belski
2d78023244
cleanup the mod version macros, round 2
2015-03-23 20:33:54 +01:00
Xinchen Hui
7b41f4a41a
Ported ldap
2015-02-02 15:05:20 +08:00
Rasmus Lerdorf
03ba4ba37e
int -> size_t
...
and fix the variable name
2015-01-20 23:00:40 -08:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Nikita Popov
2d212b426a
Drop duplicate arg from hash_get_current_key_ex
2014-12-26 21:06:18 +01:00
Andrea Faulds
e5eb9530ab
Use "float" and "integer" in typehint and zpp errors
2014-12-21 13:23:02 +00:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Anatol Belski
c00424e427
bring back all the TSRMLS_FETCH() stuff
...
for better comparability with the mainstream
2014-10-15 09:37:55 +02:00
Anatol Belski
d624b0d5eb
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master: (26 commits)
Micro optimization
Drop unused INIT_STRING opcode
Drop unused RAISE_ABSTRACT_ERROR opcode
CT substitute unqualified true/false/null in namespaces
Fix a couple compile warnings
fix test filename
one more test to illustrate transfer of an arbitrary data amount throug pipes
fix tests on linux
better test cleanup
Use more readable inline functions
increase the polling period to not to break existing behaviours
updated NEWS
Fixed bug #51800 proc_open on Windows hangs forever
Fixed segfault
Set an LDAP error code when failing ldap_bind due to null bytes
Fix segmentation fault in debug_backtrace()
Drop support for GMP 4.1
Make gmp_setbit and gmp_clrbit return values consistent
removed *.dsw and *.dsp files
Opcache compatibility for coalesce operator
...
2014-10-01 01:33:46 +02:00
Stanislav Malyshev
3fd8a76f26
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Set an LDAP error code when failing ldap_bind due to null bytes
Conflicts:
ext/ldap/ldap.c
2014-09-28 12:28:30 -07:00
Stanislav Malyshev
a8e84b1b21
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Set an LDAP error code when failing ldap_bind due to null bytes
2014-09-28 12:25:49 -07:00
Stanislav Malyshev
ef39f40445
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Set an LDAP error code when failing ldap_bind due to null bytes
2014-09-28 12:25:24 -07:00
Matthew Daley
fcbe20d357
Set an LDAP error code when failing ldap_bind due to null bytes
...
Some applications check a LDAP link's error code after seeing ldap_bind
fail due to a null byte bind attempt and hence incorrectly receive the
last set error code.
Fix by setting an LDAP error code before returning in this case.
2014-09-28 12:23:52 -07:00
Anatol Belski
4b3e198023
removed *.dsw and *.dsp files
2014-09-28 19:02:09 +02:00
krakjoe
4eed761d0e
remove fetch from ldap
2014-09-26 11:23:18 +01:00
Florian MARGAINE
8eb7e7bf7f
Merge branch 'master' into issue-67910
...
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt
2014-09-20 10:09:21 +02:00
Florian MARGAINE
cf0303e782
Replaces php5 with php7, without whitespace changes.
2014-09-20 10:01:44 +02:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Xinchen Hui
bc3d9b3ba2
Fixed segfaults after change size_t of "s"
2014-08-28 15:43:14 +08:00
Anatol Belski
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
Anatol Belski
af59e92b24
master renames phase 7
2014-08-25 21:51:49 +02:00
Anatol Belski
4d997f63d9
master renames phase 3
2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
70de6180d5
fixes to %pd format usage
2014-08-24 02:35:34 +02:00
Anatol Belski
7c7767853b
ported ext/ldap
2014-08-19 20:09:16 +02:00
Anatol Belski
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
Dmitry Stogov
c1965f58d4
Use reference counting instead of zval duplication
2014-06-05 16:04:11 +04:00
Dmitry Stogov
2af311bea3
Use new zend_hash API
2014-05-28 17:49:31 +04:00
Dmitry Stogov
b5af9e8599
More accurate mysql_close()
2014-05-20 13:19:21 +04:00
Xinchen Hui
e1317ed517
Refactored ext/ldap
2014-05-20 11:26:26 +08:00
Dmitry Stogov
17d027ed47
Split IS_BOOL into IS_FALSE and IS_TRUE
2014-04-30 18:32:42 +04:00
Dmitry Stogov
f9927a6c97
Merge mainstream 'master' branch into refactoring
...
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
Stanislav Malyshev
9af0756dd5
Fix null byte in LDAP bindings
2014-04-14 10:53:08 -07:00
Stanislav Malyshev
59900dd37f
Fix null byte in LDAP bindings
2014-04-14 10:51:32 -07:00
Stanislav Malyshev
ed4de188dd
Fix null byte in LDAP bindings
2014-04-14 10:46:46 -07:00
Stanislav Malyshev
ad1b9eef98
Fix null byte in LDAP bindings
2014-04-14 10:44:53 -07:00
Stanislav Malyshev
ea0769f00e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Implement ldap_modify_batch.
2014-01-25 22:04:39 -08:00
Stanislav Malyshev
6fca805b3b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Implement ldap_modify_batch.
Conflicts:
ext/ldap/ldap.c
2014-01-25 22:04:28 -08:00
Ondřej Hošek
c0e3429904
Implement ldap_modify_batch.
2014-01-22 18:54:11 +01:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Michael Wallner
a03b1328b8
fix compiler warnings and type usage
2013-10-18 11:34:24 +02:00
Michael Wallner
f711c1219d
Merge branch 'ldap_escape-dev' of https://github.com/DaveRandom/php-src
...
* 'ldap_escape-dev' of https://github.com/DaveRandom/php-src :
Add ldap_escape()
2013-10-18 11:17:41 +02:00
Christopher Jones
5bc377457e
Allow the ldap extension to be compiled with Oracle's LDAP
...
implementation, if desired. Note the implementations differ so you
will see different ldap behavior.
The patch allows configuration similar to:
--with-ldap=$HOME/instantclient --with-oci8=instantclient,$HOME/instantclient
The patch doesn't support configuration similar to:
--with-ldap --with-oci8=instantclient,$HOME/instantclient
since this would try and mix the default LDAP and Oracle LDAP
implementations.
This patch closes out bug #61450 and the associated github PR.
Regardless of this patch, my recommended way to install both OCI8 and
ldap extensions is to statically configure PHP with ldap, and then add
OCI8 as a shared extension from PECL.
2013-10-04 15:50:16 -07:00
Michael Wallner
d4d6a95105
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
fix memleak on resetting rebind_proc
2013-09-30 14:04:48 +02:00
Michael Wallner
2b78edfba2
fix test
2013-09-30 11:41:35 +02:00
Michael Wallner
e9e63f9223
fix memleak on resetting rebind_proc
2013-09-30 11:23:33 +02:00
Chris Wright
0d534d7c5e
Add ldap_escape()
2013-09-18 12:18:05 +01:00
Christopher Jones
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Anatoliy Belsky
5d1565088f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails
2012-04-16 15:26:50 +02:00
Anatoliy Belsky
1c435ae498
Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails
2012-04-16 15:25:20 +02:00
Anatoliy Belsky
1a44faf264
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails
2012-04-16 15:21:04 +02:00
Anatoliy Belsky
47e7755785
Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails
2012-04-16 15:20:03 +02:00
Felipe Pena
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
Scott MacVicar
3d5385dda5
Fix typo in tests for ldap bug #42060
2011-08-24 06:50:39 +00:00
Stanislav Malyshev
83039b8fee
fix params parsing
2011-08-01 04:29:37 +00:00
Felipe Pena
23e438594d
- Make usage of new PHP_FE_END macro
2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50
- Make usage of new PHP_FE_END macro
2011-07-25 11:35:02 +00:00
Scott MacVicar
1bc1d3572f
Fix prototypes for ldap_control_paged_result and fix function name in tests
2011-07-14 18:49:12 +00:00
Scott MacVicar
3cb4de03dc
Tidy up ldap paging code and rename the API as discussed in #42060
2011-05-19 17:41:21 +00:00
Raphael Geissert
a286fa3523
Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339
...
Patch by Clint Byrum
2011-03-18 18:47:09 +00:00
Raphael Geissert
5b55a18622
Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339
...
Patch by Clint Byrum
2011-03-18 18:47:09 +00:00
Felipe Pena
927bf09c29
- Year++
2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44
- Year++
2011-01-01 02:17:06 +00:00
Felipe Pena
7f9527bb22
- Fixed wrong type
2010-09-08 01:46:23 +00:00
Pierre Joye
ed4f6dbd36
- make libsasl optional (as vc6 bins do not have it)
2010-07-26 22:28:38 +00:00
Pierre Joye
79baca329b
- #42060 , add paged results support
2010-06-15 19:47:28 +00:00
Pierre Joye
6d6b037001
- #43233 , sasl support for ldap on windows
2010-05-17 20:09:42 +00:00
Pierre Joye
57cfa703bf
- #43233 , sasl support for ldap on windows
2010-05-17 20:09:42 +00:00
Rob Richards
0a34d10783
revert change #298288 : Remove old dsp/dsw/makefile files
2010-04-28 14:41:51 +00:00
Kalle Sommer Nielsen
518a17e7bf
Remove old dsp/dsw/makefile files, these arent used by the build system anymore and are barely updated nor available for all extensions
2010-04-21 23:36:49 +00:00
Sebastian Bergmann
9ba1e81665
sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php
2010-01-03 09:23:27 +00:00
Sriram Natarajan
d55669c6ab
- Update tests to reflect current behavior after fix for bug #50185
2009-12-24 02:08:23 +00:00
Sriram Natarajan
20cd29d0a2
Fixed bug #50540 (Crash within ldap_first_reference function)
2009-12-21 20:39:48 +00:00
Jani Taskinen
b741b026a1
- Fixed bug #50185 (ldap_get_entries() return false instead of an empty array when there is no error).
...
# This is also revert of bad patch to bug #48469 and fixes it properly.
2009-11-18 17:44:58 +00:00
Ilia Alshanetsky
b7bb8aa545
Fixed bug #50212 (crash by ldap_get_option() with LDAP_OPT_NETWORK_TIMEOUT).
2009-11-18 13:37:45 +00:00
Felipe Pena
b6a1b37889
- Fixed tests
2009-09-26 17:59:33 +00:00
Ilia Alshanetsky
30b7102746
Bug #49391 ldap.c utilizing deprecated ldap_modify_s
2009-08-30 15:33:59 +00:00
Ilia Alshanetsky
e6fd4c1fc0
NULL the value after free
2009-08-18 12:44:32 +00:00
Felipe Pena
88056c6bac
- Improved param. parsing for ldap_read(), ldap_search() and ldap_list()
2009-08-15 00:52:31 +00:00
Antony Dovgal
2fffc2b06c
fix test
2009-07-26 19:45:38 +00:00
Patrick Allaert
17aa260703
MFH: Tests for ext/ldap from PHPBelgium TestFest
2009-07-03 09:21:31 +00:00
Johannes Schlüter
144ff4d6b3
MFH: Fixed bug #48696 (ldap_read() segfaults with invalid parameters) (Felipe)
2009-06-25 15:19:29 +00:00
Patrick Allaert
f78a0b585c
MFH: Fixing #48441 (ldap_search() with sizelimit/timelimit/deref options makes those options persistent)
2009-06-15 15:18:31 +00:00
Patrick Allaert
91a8fd7f7e
MFH: Refactoring that will help fixing #48441
2009-06-15 15:04:11 +00:00
Patrick Allaert
4aca43008f
MFH: Removed credit
2009-06-07 21:27:19 +00:00
Patrick Allaert
10b559c28c
MFH: Fixed bug #48469 (ldap_get_entries() memory leaks on empty search results)
2009-06-07 13:07:58 +00:00
Hannes Magnusson
ac231aab45
MFH: adjust reflection info
2009-04-21 18:08:34 +00:00
Ilia Alshanetsky
4e856c44d0
Adjusted prototype
2009-04-21 12:26:19 +00:00
Sebastian Bergmann
08659c2dcd
MFH: Bump copyright year, 3 of 3.
2008-12-31 11:15:49 +00:00
Hannes Magnusson
f6cf54d2b1
Fixed bug#46847 (phpinfo() is missing some settings.)
2008-12-12 13:07:28 +00:00
Felipe Pena
fc2fb50d09
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b
- Revert ZEND_BEGIN_ARG_INFO change
2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
2008-10-24 14:35:40 +00:00
Felipe Pena
e304515ddb
- MFH: Added parameter TSRMLS_DC in zend_is_callable()
2008-08-02 04:46:07 +00:00
Pierre Joye
3250870249
- MFH: add detection for newer libs
2008-07-31 18:04:49 +00:00
Felipe Pena
644b06978a
- Fix typo (thanks Pierre)
2008-07-16 13:41:35 +00:00
Antony Dovgal
dd8202f652
int->long, add missing "s"
2008-07-01 07:43:36 +00:00
Felipe Pena
7ddf985e05
- zend_arg_defs.c is unnecessary now
2008-06-30 12:15:53 +00:00
Felipe Pena
a44269ca0a
- New parameter parsing API
...
- Added arginfo
2008-06-29 14:29:09 +00:00
Jani Taskinen
d652cec246
- Revert pointless patch: a) the version is already there, see line above,
...
b) one branch commits are idiotic to begin with, we have three active branches!
This only leads to out-of-sync situations ála PDO..
2008-06-02 11:23:16 +00:00
Pierre Joye
57bcc16896
- reintroduce the x.y.z version string info (a bit nicer to make the other guy happier)
...
- silent warning (windows only and don't remove it, thanks)
2008-06-02 10:25:54 +00:00
Jani Taskinen
930d9e47c9
- Revert crap
...
# Someone should remove Pierre's karma too..
2008-06-02 08:46:41 +00:00
Pierre Joye
2528bd43fc
- don't use openldap/portable and build the human readable version
...
- silent strdup redclaration warning
2008-06-02 06:48:35 +00:00
Pierre Joye
8290e3324a
- add OpenLDAP version info in phpinfo (windows only, have to check if openldap/portable.h is present on linux headers)
2008-06-02 00:24:19 +00:00