Attachment 5829 Details for Bug 7262 – Patch for master/3.5

[patch] Patch for master/3.5

0001-s3-Fix-another-aspect-of-bug-7262.patch (text/plain), 1.05 KB, created by Volker Lendecke on 2010-07-06 09:58:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2010-07-06 09:58:15 UTC

Size: 1.05 KB

patch

obsolete

>From 325f03d3df7afb758b6815d327739fc121dbbe71 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Tue, 6 Jul 2010 16:55:14 +0200
>Subject: [PATCH] s3: Fix another aspect of bug 7262
>
>---
> source3/passdb/pdb_ldap.c |    8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
>index 6ac8f0d..f4c8dbe 100644
>--- a/source3/passdb/pdb_ldap.c
>+++ b/source3/passdb/pdb_ldap.c
>@@ -4483,10 +4483,6 @@ static bool ldapsam_search_next_entry(struct pdb_search *search,
> 	bool result;
> 
>  retry:
>-	if (state->current_entry == NULL) {
>-		return false;
>-	}
>-
> 	if ((state->entries == NULL) && (state->pagedresults_cookie == NULL))
> 		return False;
> 
>@@ -4494,6 +4490,10 @@ static bool ldapsam_search_next_entry(struct pdb_search *search,
> 	    !ldapsam_search_nextpage(search))
> 		    return False;
> 
>+	if (state->current_entry == NULL) {
>+		return false;
>+	}
>+
> 	result = state->ldap2displayentry(state, search,
> 					  state->connection->ldap_struct,
> 					  state->current_entry, entry);
>-- 
>1.6.0.4
>

Flags:

gd: review+

Actions: View

Attachments on bug 7262: 5510 | 5788 | 5829