[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  ce11eb5 s3:smb2_ioctl: Fix Coverity ID 701771 Uninitialized scalar variable
      from  1d53e57 s4-dsdb: allow modification of some deleted object if the show-deleted control is presented

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


- Log -----------------------------------------------------------------
commit ce11eb5b9427e4ba5b86c6cd0378a7300ce1218f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon May 21 11:44:09 2012 +0200

    s3:smb2_ioctl: Fix Coverity ID 701771 Uninitialized scalar variable
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon May 21 19:27:44 CEST 2012 on sn-devel-104

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

Summary of changes:
 source3/smbd/smb2_ioctl.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_ioctl.c b/source3/smbd/smb2_ioctl.c
index b1a9e32..37acf11 100644
--- a/source3/smbd/smb2_ioctl.c
+++ b/source3/smbd/smb2_ioctl.c
@@ -417,6 +417,11 @@ static struct tevent_req *smbd_smb2_ioctl_send(TALLOC_CTX *mem_ctx,
 		in_security_mode = SVAL(in_input.data, 0x14);
 		in_max_dialect = SVAL(in_input.data, 0x16);
 
+		status = GUID_from_ndr_blob(&in_guid_blob, &in_guid);
+		if (tevent_req_nterror(req, status)) {
+			return tevent_req_post(req, ev);
+		}
+
 		max_dialect = conn->smb2.client.dialects[conn->smb2.client.num_dialects-1];
 		if (in_max_dialect != max_dialect) {
 			state->disconnect = true;
@@ -494,6 +499,11 @@ static struct tevent_req *smbd_smb2_ioctl_send(TALLOC_CTX *mem_ctx,
 			return tevent_req_post(req, ev);
 		}
 
+		status = GUID_from_ndr_blob(&in_guid_blob, &in_guid);
+		if (tevent_req_nterror(req, status)) {
+			return tevent_req_post(req, ev);
+		}
+
 		if (in_num_dialects != conn->smb2.client.num_dialects) {
 			state->disconnect = true;
 			tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED);


-- 
Samba Shared Repository