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

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  e686621 s3: Fix bug 8904 -- wbinfo --lookup-sids "" crashes winbind
      from  237d4da s3: Fix a segfault with debug level 3 on Solaris

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


- Log -----------------------------------------------------------------
commit e68662130c6c4c081d23f1a24cc3e9a3d2993224
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Apr 28 19:51:46 2012 +0200

    s3: Fix bug 8904 -- wbinfo --lookup-sids "" crashes winbind
    
    Much of the code further down and up the call chain expects the
    structures wb_lookupsids returns to be allocated. Do that despite
    we have nothing to look up.

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

Summary of changes:
 source3/winbindd/wb_lookupsids.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/wb_lookupsids.c b/source3/winbindd/wb_lookupsids.c
index cdca7c7..2fd735d 100644
--- a/source3/winbindd/wb_lookupsids.c
+++ b/source3/winbindd/wb_lookupsids.c
@@ -123,11 +123,6 @@ struct tevent_req *wb_lookupsids_send(TALLOC_CTX *mem_ctx,
 	state->sids = sids;
 	state->num_sids = num_sids;
 
-	if (num_sids == 0) {
-		tevent_req_done(req);
-		return tevent_req_post(req, ev);
-	}
-
 	state->single_sids = TALLOC_ARRAY(state, uint32_t, num_sids);
 	if (tevent_req_nomem(state->single_sids, req)) {
 		return tevent_req_post(req, ev);
@@ -153,6 +148,11 @@ struct tevent_req *wb_lookupsids_send(TALLOC_CTX *mem_ctx,
 		return tevent_req_post(req, ev);
 	}
 
+	if (num_sids == 0) {
+		tevent_req_done(req);
+		return tevent_req_post(req, ev);
+	}
+
 	for (i=0; i<num_sids; i++) {
 		struct wb_lookupsids_domain *d;
 


-- 
Samba Shared Repository