[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  5c53926 s3: Use tevent_req_simple_recv_ntstatus
       via  7491bd7 Fix Coverity ID 2638: OVERRUN_STATIC
       via  f094cc3 Fix Coverity ID 2639: UNUSED_VALUE
      from  0d4fc19 s3: Fix a crash in group_mapping.ldb->tdb conversion

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


- Log -----------------------------------------------------------------
commit 5c53926fa7fcb7e9f88b481936ffd2e68b116675
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 24 10:55:30 2011 +0100

    s3: Use tevent_req_simple_recv_ntstatus
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Mon Nov 28 17:14:27 CET 2011 on sn-devel-104

commit 7491bd78d6c17c56e6b6fa87db94063852fa33e1
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 28 14:50:03 2011 +0100

    Fix Coverity ID 2638: OVERRUN_STATIC

commit f094cc3ade2466d4c51b4d8ceaff67be281fda87
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 28 14:34:00 2011 +0100

    Fix Coverity ID 2639: UNUSED_VALUE

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

Summary of changes:
 libcli/smb/smbXcli_base.c      |    4 +---
 source3/winbindd/wb_getpwsid.c |    7 +------
 2 files changed, 2 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index e3d7a26..16f594b 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -1062,7 +1062,7 @@ struct tevent_req *smb1cli_req_create(TALLOC_CTX *mem_ctx,
 	SSVAL(state->smb1.hdr, HDR_PID,     pid);
 	SSVAL(state->smb1.hdr, HDR_UID,     uid);
 	SSVAL(state->smb1.hdr, HDR_MID,     0); /* this comes later */
-	SSVAL(state->smb1.hdr, HDR_WCT,     wct);
+	SCVAL(state->smb1.hdr, HDR_WCT,     wct);
 
 	state->smb1.vwv = vwv;
 
@@ -3697,7 +3697,6 @@ static NTSTATUS smbXcli_negprot_dispatch_incoming(struct smbXcli_conn *conn,
 	struct tevent_req *subreq;
 	struct smbXcli_req_state *substate;
 	struct tevent_req *req;
-	struct smbXcli_negprot_state *state;
 	uint32_t protocol_magic = IVAL(inbuf, 4);
 
 	if (num_pending != 1) {
@@ -3707,7 +3706,6 @@ static NTSTATUS smbXcli_negprot_dispatch_incoming(struct smbXcli_conn *conn,
 	subreq = conn->pending[0];
 	substate = tevent_req_data(subreq, struct smbXcli_req_state);
 	req = tevent_req_callback_data(subreq, struct tevent_req);
-	state = tevent_req_data(req, struct smbXcli_negprot_state);
 
 	switch (protocol_magic) {
 	case SMB_MAGIC:
diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c
index 5bd384b..ef54ee5 100644
--- a/source3/winbindd/wb_getpwsid.c
+++ b/source3/winbindd/wb_getpwsid.c
@@ -136,10 +136,5 @@ static void wb_getpwsid_done(struct tevent_req *subreq)
 
 NTSTATUS wb_getpwsid_recv(struct tevent_req *req)
 {
-	NTSTATUS status;
-
-	if (tevent_req_is_nterror(req, &status)) {
-		return status;
-	}
-	return NT_STATUS_OK;
+	return tevent_req_simple_recv_ntstatus(req);
 }


-- 
Samba Shared Repository