Skip to content

Commit b91c284

Browse files
GirgiasGirgias
committed
Drop check for HAVE_NSLDAP
This constant is never defined thus useless
1 parent 197cac6 commit b91c284

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎ext/ldap/ldap.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ function ldap_control_paged_result($link, int $pagesize, bool $iscritical = fals
209209
function ldap_control_paged_result_response($link, $result, &$cookie = null, &$estimated = null): bool {}
210210
#endif
211211

212-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
212+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
213213
/** @param resource $link_identifier */
214214
function ldap_rename($link_identifier, string $dn, string $newrdn, string $newparent, bool $deleteoldrdn, array $servercontrols = []): bool {}
215215

‎ext/ldap/ldap_arginfo.h

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_control_paged_result_respon
204204
ZEND_END_ARG_INFO()
205205
#endif
206206

207-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
207+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
208208
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_rename, 0, 5, _IS_BOOL, 0)
209209
ZEND_ARG_INFO(0, link_identifier)
210210
ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
@@ -215,7 +215,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_rename, 0, 5, _IS_BOOL, 0)
215215
ZEND_END_ARG_INFO()
216216
#endif
217217

218-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
218+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
219219
ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_rename_ext, 0, 0, 5)
220220
ZEND_ARG_INFO(0, link_identifier)
221221
ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
@@ -226,45 +226,45 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_rename_ext, 0, 0, 5)
226226
ZEND_END_ARG_INFO()
227227
#endif
228228

229-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
229+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
230230
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_get_option, 0, 2, _IS_BOOL, 0)
231231
ZEND_ARG_INFO(0, link_identifier)
232232
ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
233233
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retval, "null")
234234
ZEND_END_ARG_INFO()
235235
#endif
236236

237-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
237+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
238238
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_set_option, 0, 3, _IS_BOOL, 0)
239239
ZEND_ARG_INFO(0, link_identifier)
240240
ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
241241
ZEND_ARG_INFO(0, newval)
242242
ZEND_END_ARG_INFO()
243243
#endif
244244

245-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
245+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
246246
ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_first_reference, 0, 0, 2)
247247
ZEND_ARG_INFO(0, link)
248248
ZEND_ARG_INFO(0, result)
249249
ZEND_END_ARG_INFO()
250250
#endif
251251

252-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
252+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
253253
ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_next_reference, 0, 0, 2)
254254
ZEND_ARG_INFO(0, link)
255255
ZEND_ARG_INFO(0, entry)
256256
ZEND_END_ARG_INFO()
257257
#endif
258258

259-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP && defined(HAVE_LDAP_PARSE_REFERENCE)
259+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP && defined(HAVE_LDAP_PARSE_REFERENCE)
260260
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_reference, 0, 3, _IS_BOOL, 0)
261261
ZEND_ARG_INFO(0, link)
262262
ZEND_ARG_INFO(0, entry)
263263
ZEND_ARG_INFO(1, referrals)
264264
ZEND_END_ARG_INFO()
265265
#endif
266266

267-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP && defined(HAVE_LDAP_PARSE_RESULT)
267+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP && defined(HAVE_LDAP_PARSE_RESULT)
268268
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_result, 0, 3, _IS_BOOL, 0)
269269
ZEND_ARG_INFO(0, link)
270270
ZEND_ARG_INFO(0, result)
@@ -398,28 +398,28 @@ ZEND_FUNCTION(ldap_control_paged_result);
398398
#if defined(LDAP_CONTROL_PAGEDRESULTS)
399399
ZEND_FUNCTION(ldap_control_paged_result_response);
400400
#endif
401-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
401+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
402402
ZEND_FUNCTION(ldap_rename);
403403
#endif
404-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
404+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
405405
ZEND_FUNCTION(ldap_rename_ext);
406406
#endif
407-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
407+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
408408
ZEND_FUNCTION(ldap_get_option);
409409
#endif
410-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
410+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
411411
ZEND_FUNCTION(ldap_set_option);
412412
#endif
413-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
413+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
414414
ZEND_FUNCTION(ldap_first_reference);
415415
#endif
416-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
416+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
417417
ZEND_FUNCTION(ldap_next_reference);
418418
#endif
419-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP && defined(HAVE_LDAP_PARSE_REFERENCE)
419+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP && defined(HAVE_LDAP_PARSE_REFERENCE)
420420
ZEND_FUNCTION(ldap_parse_reference);
421421
#endif
422-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP && defined(HAVE_LDAP_PARSE_RESULT)
422+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP && defined(HAVE_LDAP_PARSE_RESULT)
423423
ZEND_FUNCTION(ldap_parse_result);
424424
#endif
425425
#if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC)
@@ -504,28 +504,28 @@ static const zend_function_entry ext_functions[] = {
504504
#if defined(LDAP_CONTROL_PAGEDRESULTS)
505505
ZEND_DEP_FE(ldap_control_paged_result_response, arginfo_ldap_control_paged_result_response)
506506
#endif
507-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
507+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
508508
ZEND_FE(ldap_rename, arginfo_ldap_rename)
509509
#endif
510-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
510+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
511511
ZEND_FE(ldap_rename_ext, arginfo_ldap_rename_ext)
512512
#endif
513-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
513+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
514514
ZEND_FE(ldap_get_option, arginfo_ldap_get_option)
515515
#endif
516-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
516+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
517517
ZEND_FE(ldap_set_option, arginfo_ldap_set_option)
518518
#endif
519-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
519+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
520520
ZEND_FE(ldap_first_reference, arginfo_ldap_first_reference)
521521
#endif
522-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
522+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP
523523
ZEND_FE(ldap_next_reference, arginfo_ldap_next_reference)
524524
#endif
525-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP && defined(HAVE_LDAP_PARSE_REFERENCE)
525+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP && defined(HAVE_LDAP_PARSE_REFERENCE)
526526
ZEND_FE(ldap_parse_reference, arginfo_ldap_parse_reference)
527527
#endif
528-
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP && defined(HAVE_LDAP_PARSE_RESULT)
528+
#if (LDAP_API_VERSION > 2000) || HAVE_ORALDAP && defined(HAVE_LDAP_PARSE_RESULT)
529529
ZEND_FE(ldap_parse_result, arginfo_ldap_parse_result)
530530
#endif
531531
#if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC)

0 commit comments

Comments
 (0)