From: Volker Lendecke <vl@samba.org>
Date: Fri, 27 Jan 2017 15:03:03 +0000 (+0100)
Subject: tldap: Allow dropping messages in tldap_search()
X-Git-Tag: tdb-1.3.13~441
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=649deb63c5a2b034ff45bdafc9c8ef64535821f0;p=thirdparty%2Fsamba.git

tldap: Allow dropping messages in tldap_search()

For probing whether a connection is a live a rootdse search might be
interesting where we don't really care for the result, only success or
failure of the operation.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c
index 5fcb43c29f4..40064fdeeed 100644
--- a/source3/lib/tldap.c
+++ b/source3/lib/tldap.c
@@ -1995,7 +1995,7 @@ TLDAPRC tldap_search(struct tldap_context *ld,
 		rc = TLDAP_OPERATIONS_ERROR;
 		goto fail;
 	}
-	rc = tldap_search_all_recv(req, mem_ctx, &msgs, &result);
+	rc = tldap_search_all_recv(req, frame, &msgs, &result);
 	TALLOC_FREE(req);
 	if (!TLDAP_RC_IS_SUCCESS(rc)) {
 		goto fail;
@@ -2004,7 +2004,9 @@ TLDAPRC tldap_search(struct tldap_context *ld,
 	TALLOC_FREE(ld->last_msg);
 	ld->last_msg = talloc_move(ld, &result);
 
-	*pmsgs = msgs;
+	if (pmsgs != NULL) {
+		*pmsgs = talloc_move(mem_ctx, &msgs);
+	}
 fail:
 	TALLOC_FREE(frame);
 	return rc;