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

[Michael Adam]

The branch, v3-5-test has been updated
       via  afb06a8... Fix large paged search
       via  a15ffba... fix bogus "out of memory" winbind msg
      from  d718908... s3: Convert cli_unix_extensions_version to async

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


- Log -----------------------------------------------------------------
commit afb06a8af3c4e86ef9960c8beb19a22f5fd0f3c2
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 18 16:04:04 2009 +0200

    Fix large paged search
    
    Signed-off-by: Michael Adam <obnox at samba.org>

commit a15ffba403cebd8b915f6fdd3de66114c0871219
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 13 10:12:26 2009 +0200

    fix bogus "out of memory" winbind msg
    
    Signed-off-by: Michael Adam <obnox at samba.org>

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

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


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 87df75e..d4a2fbe 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -4337,6 +4337,7 @@ static bool ldapsam_search_firstpage(struct pdb_search *search)
 	if (state->current_entry == NULL) {
 		ldap_msgfree(state->entries);
 		state->entries = NULL;
+		return false;
 	}
 
 	return True;
diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index d49fa47..74fd082 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -232,7 +232,8 @@ static NTSTATUS rpccli_lsa_lookup_sids_noalloc(struct rpc_pipe_client *cli,
 			} else {
 				(names)[i] = NULL;
 			}
-			(domains)[i] = talloc_strdup(mem_ctx, dom_name);
+			domains[i] = talloc_strdup(
+				mem_ctx, dom_name ? dom_name : "");
 			(types)[i] = lsa_names.names[i].sid_type;
 			if (((domains)[i] == NULL)) {
 				DEBUG(0, ("cli_lsa_lookup_sids_noalloc(): out of memory\n"));


-- 
Samba Shared Repository