[SCM] Samba Shared Repository - branch v3-4-test updated
Karolin Seeger
kseeger at samba.org
Thu Dec 10 01:31:39 MST 2009
The branch, v3-4-test has been updated
via 0a3b576... s3:pdb_ldap: Fix large paged search.
via a6d9c21... fix bogus "out of memory" winbind msg
from 886a90c... s3 aclocal.m4: Fix iconv checks, clean up m4 code
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit 0a3b576c0a4298cbe600ad8943e401e3a0639359
Author: Volker Lendecke <vl at samba.org>
Date: Mon May 18 16:04:04 2009 +0200
s3:pdb_ldap: Fix large paged search.
Fix bug #6981 (Paged Search with DirX LDAP server broken).
commit a6d9c2161859fff61bdd0539d9428615da3da655
Author: Volker Lendecke <vl at samba.org>
Date: Wed May 13 10:12:26 2009 +0200
fix bogus "out of memory" winbind msg
Fix bug #6982 (Erroneous out of memory error path in lookup_sid).
-----------------------------------------------------------------------
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 71d4030..6a5c96f 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -4336,6 +4336,7 @@ static bool ldapsam_search_nextpage(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
More information about the samba-cvs
mailing list