[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2053-gd960057

Stefan Metzmacher metze at samba.org
Fri Jun 5 12:34:41 GMT 2009


The branch, master has been updated
       via  d9600573120e79c73e30d588cffb17586df312c1 (commit)
       via  f40b9ed8e9cda6397b272b055bad1cc9d8b32fe2 (commit)
      from  5e0f122f7c00c7ba76a5f550c67ca31e5bea9aae (commit)

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


- Log -----------------------------------------------------------------
commit d9600573120e79c73e30d588cffb17586df312c1
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jun 5 14:32:27 2009 +0200

    s3:smbd: add missing return statements to the SMB2 write error cases
    
    metze

commit f40b9ed8e9cda6397b272b055bad1cc9d8b32fe2
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jun 5 14:31:41 2009 +0200

    s3:smbd: add missing return statements to the SMB2 read error cases
    
    metze

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

Summary of changes:
 source3/smbd/smb2_read.c  |    2 ++
 source3/smbd/smb2_write.c |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index 88668ab..7a51cef 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -127,6 +127,7 @@ static void smbd_smb2_request_read_done(struct tevent_req *subreq)
 							 nt_errstr(error));
 			return;
 		}
+		return;
 	}
 
 	out_data_offset = SMB2_HDR_BODY + 0x10;
@@ -141,6 +142,7 @@ static void smbd_smb2_request_read_done(struct tevent_req *subreq)
 							 nt_errstr(error));
 			return;
 		}
+		return;
 	}
 
 	SSVAL(outbody.data, 0x00, 0x10 + 1);	/* struct size */
diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c
index 78b63dc..1f19a66 100644
--- a/source3/smbd/smb2_write.c
+++ b/source3/smbd/smb2_write.c
@@ -130,6 +130,7 @@ static void smbd_smb2_request_write_done(struct tevent_req *subreq)
 							 nt_errstr(error));
 			return;
 		}
+		return;
 	}
 
 	outhdr = (uint8_t *)req->out.vector[i].iov_base;
@@ -142,6 +143,7 @@ static void smbd_smb2_request_write_done(struct tevent_req *subreq)
 							 nt_errstr(error));
 			return;
 		}
+		return;
 	}
 
 	SSVAL(outbody.data, 0x00, 0x10 + 1);	/* struct size */


-- 
Samba Shared Repository


More information about the samba-cvs mailing list