[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  135b67a... Do not segfault in pdb_search_destructor if no real search was started (cherry picked from commit d07464b21fe652e205f5eb2c74d12495bab100ce)
      from  69100db... s3-docs: Adapt version in man ldbrename.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 135b67a627fd1e98b4211fe3ac738ae2fec10145
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 27 18:40:13 2009 +0200

    Do not segfault in pdb_search_destructor if no real search was started
    (cherry picked from commit d07464b21fe652e205f5eb2c74d12495bab100ce)
    
    Fix bug #7068 (pdb_search api may crash as non-root user).

-----------------------------------------------------------------------

Summary of changes:
 source3/passdb/pdb_interface.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 8c00329..01815c6 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -1711,7 +1711,7 @@ static NTSTATUS pdb_default_lookup_names(struct pdb_methods *methods,
 
 static int pdb_search_destructor(struct pdb_search *search)
 {
-	if (!search->search_ended) {
+	if ((!search->search_ended) && (search->search_end != NULL)) {
 		search->search_end(search);
 	}
 	return 0;
@@ -1733,6 +1733,7 @@ struct pdb_search *pdb_search_init(TALLOC_CTX *mem_ctx,
 	result->num_entries = 0;
 	result->cache_size = 0;
 	result->search_ended = False;
+	result->search_end = NULL;
 
 	/* Segfault appropriately if not initialized */
 	result->next_entry = NULL;


-- 
Samba Shared Repository