[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  43d5440 s4-winbind: fixed two valgrind errors
      from  b04b8b5 wbclient: gr_mem can be NULL

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 43d54406b19a8041633eb26d7a809e3fd7de3ef6
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Sep 16 21:17:54 2010 +1000

    s4-winbind: fixed two valgrind errors
    
    - allocate the dc info on the right structure
    - zero the number of group members when allocating the winbindd_gr
      return
    
    Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 source4/winbind/wb_cmd_getgrgid.c |    2 +-
 source4/winbind/wb_dom_info.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/winbind/wb_cmd_getgrgid.c b/source4/winbind/wb_cmd_getgrgid.c
index 93e01c8..fe946ed 100644
--- a/source4/winbind/wb_cmd_getgrgid.c
+++ b/source4/winbind/wb_cmd_getgrgid.c
@@ -130,7 +130,7 @@ static void cmd_getgrgid_recv_group_info(struct composite_context *ctx)
 
 	DEBUG(5, ("cmd_getgrgid_recv_group_info called\n"));
 
-	gr = talloc(state, struct winbindd_gr);
+	gr = talloc_zero(state, struct winbindd_gr);
 	if (composite_nomem(gr, state->ctx)) return;
 
 	group_info = talloc(state, struct libnet_GroupInfo);
diff --git a/source4/winbind/wb_dom_info.c b/source4/winbind/wb_dom_info.c
index d2ce8a9..c0d708c 100644
--- a/source4/winbind/wb_dom_info.c
+++ b/source4/winbind/wb_dom_info.c
@@ -96,7 +96,7 @@ static void get_dom_info_recv_addrs(struct tevent_req *req)
 	struct get_dom_info_state *state = tevent_req_callback_data(req, struct get_dom_info_state);
 	struct finddcs finddcs_io;
 
-	state->info->dc = talloc(state, struct nbt_dc_name);
+	state->info->dc = talloc(state->info, struct nbt_dc_name);
 
 	state->ctx->status = finddcs_cldap_recv(req, state->info, &finddcs_io);
 	if (!composite_is_ok(state->ctx)) return;


-- 
Samba Shared Repository