Skip to content

Commit

Permalink
Add control support across new operations.
Browse files Browse the repository at this point in the history
  • Loading branch information
Graham Leggett committed Feb 14, 2025
1 parent 4176cb1 commit b8979a9
Show file tree
Hide file tree
Showing 4 changed files with 179 additions and 66 deletions.
28 changes: 14 additions & 14 deletions include/apr_ldap_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1288,8 +1288,8 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_compare(apr_pool_t *pool,
const char *dn,
const char *attr,
const apr_buffer_t *val,
apr_ldap_control_t **serverctrls,
apr_ldap_control_t **clientctrls,
apr_array_header_t *serverctrls,
apr_array_header_t *clientctrls,
apr_interval_time_t timeout,
apr_ldap_compare_cb compare_cb, void *ctx,
apu_err_t *err)
Expand Down Expand Up @@ -1532,8 +1532,8 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_add(apr_pool_t *pool,
apr_ldap_t *ldap,
const char *dn,
apr_array_header_t *adds,
apr_ldap_control_t **serverctrls,
apr_ldap_control_t **clientctrls,
apr_array_header_t *serverctrls,
apr_array_header_t *clientctrls,
apr_interval_time_t timeout,
apr_ldap_add_cb add_cb, void *ctx,
apu_err_t *err)
Expand Down Expand Up @@ -1650,8 +1650,8 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_modify(apr_pool_t *pool,
apr_ldap_t *ldap,
const char *dn,
apr_array_header_t *mods,
apr_ldap_control_t **serverctrls,
apr_ldap_control_t **clientctrls,
apr_array_header_t *serverctrls,
apr_array_header_t *clientctrls,
apr_interval_time_t timeout,
apr_ldap_modify_cb modify_cb, void *ctx,
apu_err_t *err)
Expand Down Expand Up @@ -1748,8 +1748,8 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_rename(apr_pool_t *pool,
apr_ldap_t *ldap,
const char *dn, const char *newrdn, const char *newparent,
apr_ldap_rename_e flags,
apr_ldap_control_t **serverctrls,
apr_ldap_control_t **clientctrls,
apr_array_header_t *serverctrls,
apr_array_header_t *clientctrls,
apr_interval_time_t timeout,
apr_ldap_rename_cb rename_cb, void *ctx,
apu_err_t *err)
Expand Down Expand Up @@ -1829,8 +1829,8 @@ typedef apr_status_t (*apr_ldap_delete_cb)(apr_ldap_t *ldap, apr_status_t status
APU_DECLARE_LDAP(apr_status_t) apr_ldap_delete(apr_pool_t *pool,
apr_ldap_t *ldap,
const char *dn,
apr_ldap_control_t **serverctrls,
apr_ldap_control_t **clientctrls,
apr_array_header_t *serverctrls,
apr_array_header_t *clientctrls,
apr_interval_time_t timeout,
apr_ldap_delete_cb delete_cb, void *ctx,
apu_err_t *err)
Expand Down Expand Up @@ -1912,8 +1912,8 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_extended(apr_pool_t *pool,
apr_ldap_t *ldap,
const char *oid,
apr_buffer_t *data,
apr_ldap_control_t **serverctrls,
apr_ldap_control_t **clientctrls,
apr_array_header_t *serverctrls,
apr_array_header_t *clientctrls,
apr_interval_time_t timeout,
apr_ldap_extended_cb ext_cb, void *ctx,
apu_err_t *err)
Expand All @@ -1930,8 +1930,8 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_extended(apr_pool_t *pool,
* @see apr_ldap_initialise
*/
APU_DECLARE_LDAP(apr_status_t) apr_ldap_unbind(apr_ldap_t *ldap,
apr_ldap_control_t **serverctrls,
apr_ldap_control_t **clientctrls,
apr_array_header_t *serverctrls,
apr_array_header_t *clientctrls,
apu_err_t *err)
__attribute__((nonnull(1,4)));

Expand Down
28 changes: 14 additions & 14 deletions include/private/apu_internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ struct apr__ldap_dso_fntable {
apr_status_t (*compare)(apr_pool_t *pool, apr_ldap_t *ldap,
const char *dn, const char *attr,
const apr_buffer_t *bval,
apr_ldap_control_t **serverctrls,
apr_ldap_control_t **clientctrls,
apr_array_header_t *serverctrls,
apr_array_header_t *clientctrls,
apr_interval_time_t timeout,
apr_ldap_compare_cb compare_cb, void *ctx, apu_err_t *err);
apr_status_t (*search)(apr_pool_t *pool, apr_ldap_t *ldap, const char *dn,
Expand All @@ -102,37 +102,37 @@ struct apr__ldap_dso_fntable {
void *search_ctx, apu_err_t *err);
apr_status_t (*add)(apr_pool_t *pool, apr_ldap_t *ldap,
const char *dn, apr_array_header_t *adds,
apr_ldap_control_t **serverctrls,
apr_ldap_control_t **clientctrls,
apr_array_header_t *serverctrls,
apr_array_header_t *clientctrls,
apr_interval_time_t timeout,
apr_ldap_add_cb add_cb, void *ctx, apu_err_t *err);
apr_status_t (*modify)(apr_pool_t *pool, apr_ldap_t *ldap,
const char *dn, apr_array_header_t *mods,
apr_ldap_control_t **serverctrls,
apr_ldap_control_t **clientctrls,
apr_array_header_t *serverctrls,
apr_array_header_t *clientctrls,
apr_interval_time_t timeout,
apr_ldap_modify_cb modify_cb, void *ctx, apu_err_t *err);
apr_status_t (*rename)(apr_pool_t *pool, apr_ldap_t *ldap,
const char *dn, const char *newrdn, const char *newparent,
apr_ldap_rename_e flags,
apr_ldap_control_t **serverctrls,
apr_ldap_control_t **clientctrls,
apr_array_header_t *serverctrls,
apr_array_header_t *clientctrls,
apr_interval_time_t timeout,
apr_ldap_rename_cb rename_cb, void *ctx, apu_err_t *err);
apr_status_t (*delete)(apr_pool_t *pool, apr_ldap_t *ldap,
const char *dn,
apr_ldap_control_t **serverctrls,
apr_ldap_control_t **clientctrls,
apr_array_header_t *serverctrls,
apr_array_header_t *clientctrls,
apr_interval_time_t timeout,
apr_ldap_delete_cb delete_cb, void *ctx, apu_err_t *err);
apr_status_t (*extended)(apr_pool_t *pool, apr_ldap_t *ldap,
const char *dn, apr_buffer_t *data,
apr_ldap_control_t **serverctrls,
apr_ldap_control_t **clientctrls,
apr_array_header_t *serverctrls,
apr_array_header_t *clientctrls,
apr_interval_time_t timeout,
apr_ldap_extended_cb ext_cb, void *ctx, apu_err_t *err);
apr_status_t (*unbind)(apr_ldap_t *ldap, apr_ldap_control_t **serverctrls,
apr_ldap_control_t **clientctrls, apu_err_t *err);
apr_status_t (*unbind)(apr_ldap_t *ldap, apr_array_header_t *serverctrls,
apr_array_header_t *clientctrls, apu_err_t *err);
};

#endif /* APR_HAS_LDAP */
Expand Down
Loading

0 comments on commit b8979a9

Please sign in to comment.