[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Wed Jan 22 17:41:04 MST 2014

The branch, master has been updated
       via  b04e8b7 s3: ldap client can return NT_STATUS_OK when an error occurs in a paged search.
      from  0f347e4 log winbind version (when requested) in winbindd log


- Log -----------------------------------------------------------------
commit b04e8b7557b82a4b96cf74db04742fb017edb3ba
Author: Daniel Liberman <dliberman at lenovoemc.com>
Date:   Tue Jan 21 16:25:41 2014 -0800

    s3: ldap client can return NT_STATUS_OK when an error occurs in a paged search.
    "Inside ads_do_search_all_args(), if the first call to ads_do_paged_search_args()
    fails, the proper error status is returned.
    But, if the execution is already inside the loop to get all the accounts doing
    several calls to ads_do_paged_search_args(), and one of these calls times out,
    the status returned is from the *first* call, so success. This causes
    net_ads_search() to interpret the return from ads_do_search_retry() as
    success and print all the accounts returned, but it’s only a subset."
    Also ensure we free previously returned results on error
    in subsequent fetches.
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Richard Sharpe <realrichardsharpe at gmail.com>
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Jan 23 01:40:54 CET 2014 on sn-devel-104


Summary of changes:
 source3/libads/ldap.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

Changeset truncated at 500 lines:

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 12aacd4..10ac8fc 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -1140,13 +1140,16 @@ static ADS_STATUS ads_do_paged_search(ADS_STRUCT *ads, const char *bind_path,
 	while (cookie) {
 		LDAPMessage *res2 = NULL;
-		ADS_STATUS status2;
 		LDAPMessage *msg, *next;
-		status2 = ads_do_paged_search_args(ads, bind_path, scope, expr, 
+		status = ads_do_paged_search_args(ads, bind_path, scope, expr,
 					      attrs, args, &res2, &count, &cookie);
-		if (!ADS_ERR_OK(status2)) break;
+		if (!ADS_ERR_OK(status)) {
+			/* Ensure we free all collected results */
+			ads_msgfree(ads, *res);
+			*res = NULL;
+			break;
+		}
 		/* this relies on the way that ldap_add_result_entry() works internally. I hope
 		   that this works on all ldap libs, but I have only tested with openldap */

Samba Shared Repository

More information about the samba-cvs mailing list