From: Pavel Filipenský Date: Mon, 19 Jan 2026 18:47:25 +0000 (+0100) Subject: s3:libads: Fix trailing whitespaces in ldap_utils.c X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4264dd742154d5b62425953bb27fd242291802d1;p=thirdparty%2Fsamba.git s3:libads: Fix trailing whitespaces in ldap_utils.c Signed-off-by: Pavel Filipenský Reviewed-by: Andreas Schneider --- diff --git a/source3/libads/ldap_utils.c b/source3/libads/ldap_utils.c index 9d6d962a2bc..dee6ea42356 100644 --- a/source3/libads/ldap_utils.c +++ b/source3/libads/ldap_utils.c @@ -1,7 +1,7 @@ -/* +/* Unix SMB/CIFS implementation. - Some Helpful wrappers on LDAP + Some Helpful wrappers on LDAP Copyright (C) Andrew Tridgell 2001 Copyright (C) Guenther Deschner 2006,2007 @@ -56,7 +56,7 @@ static ADS_STATUS ads_ranged_search_internal(ADS_STRUCT *ads, a wrapper around ldap_search_s that retries depending on the error code this is supposed to catch dropped connections and auto-reconnect */ -static ADS_STATUS ads_do_search_retry_internal(ADS_STRUCT *ads, const char *bind_path, int scope, +static ADS_STATUS ads_do_search_retry_internal(ADS_STRUCT *ads, const char *bind_path, int scope, const char *expr, const char **attrs, void *args, LDAPMessage **res) @@ -109,7 +109,7 @@ static ADS_STATUS ads_do_search_retry_internal(ADS_STRUCT *ads, const char *bind ads->config.ldap_page_size = new_page_size; } - if (*res) + if (*res) ads_msgfree(ads, *res); *res = NULL; @@ -178,7 +178,7 @@ static ADS_STATUS ads_do_search_retry_internal(ADS_STRUCT *ads, const char *bind SAFE_FREE(bp); if (!ADS_ERR_OK(status)) { - DEBUG(1,("ads reopen failed after error %s\n", + DEBUG(1,("ads reopen failed after error %s\n", ads_errstr(status))); } return status; @@ -200,24 +200,24 @@ static ADS_STATUS ads_do_search_retry_args(ADS_STRUCT *ads, const char *bind_pat } - ADS_STATUS ads_search_retry(ADS_STRUCT *ads, LDAPMessage **res, + ADS_STATUS ads_search_retry(ADS_STRUCT *ads, LDAPMessage **res, const char *expr, const char **attrs) { return ads_do_search_retry(ads, ads->config.bind_path, LDAP_SCOPE_SUBTREE, expr, attrs, res); } - ADS_STATUS ads_search_retry_dn(ADS_STRUCT *ads, LDAPMessage **res, - const char *dn, + ADS_STATUS ads_search_retry_dn(ADS_STRUCT *ads, LDAPMessage **res, + const char *dn, const char **attrs) { return ads_do_search_retry(ads, dn, LDAP_SCOPE_BASE, "(objectclass=*)", attrs, res); } - ADS_STATUS ads_search_retry_dn_sd_flags(ADS_STRUCT *ads, LDAPMessage **res, + ADS_STATUS ads_search_retry_dn_sd_flags(ADS_STRUCT *ads, LDAPMessage **res, uint32_t sd_flags, - const char *dn, + const char *dn, const char **attrs) { ads_control args; @@ -230,8 +230,8 @@ static ADS_STATUS ads_do_search_retry_args(ADS_STRUCT *ads, const char *bind_pat "(objectclass=*)", attrs, &args, res); } - ADS_STATUS ads_search_retry_extended_dn_ranged(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, - const char *dn, + ADS_STATUS ads_search_retry_extended_dn_ranged(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, + const char *dn, const char **attrs, enum ads_extended_dn_flags flags, char ***strings, @@ -248,13 +248,13 @@ static ADS_STATUS ads_do_search_retry_args(ADS_STRUCT *ads, const char *bind_pat return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER); } - return ads_ranged_search(ads, mem_ctx, LDAP_SCOPE_BASE, dn, + return ads_ranged_search(ads, mem_ctx, LDAP_SCOPE_BASE, dn, "(objectclass=*)", &args, attrs[0], strings, num_strings); } - ADS_STATUS ads_search_retry_sid(ADS_STRUCT *ads, LDAPMessage **res, + ADS_STATUS ads_search_retry_sid(ADS_STRUCT *ads, LDAPMessage **res, const struct dom_sid *sid, const char **attrs) { @@ -278,7 +278,7 @@ static ADS_STATUS ads_do_search_retry_args(ADS_STRUCT *ads, const char *bind_pat return status; } -ADS_STATUS ads_ranged_search(ADS_STRUCT *ads, +ADS_STATUS ads_ranged_search(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, int scope, const char *base, @@ -308,11 +308,11 @@ ADS_STATUS ads_ranged_search(ADS_STRUCT *ads, ADS_ERROR_HAVE_NO_MEMORY(attrs[1]); do { - status = ads_ranged_search_internal(ads, mem_ctx, - scope, base, filter, - attrs, args, range_attr, + status = ads_ranged_search_internal(ads, mem_ctx, + scope, base, filter, + attrs, args, range_attr, strings, num_strings, - &first_usn, &num_retries, + &first_usn, &num_retries, &more_values); if (NT_STATUS_EQUAL(STATUS_MORE_ENTRIES, ads_ntstatus(status))) {