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

Karolin Seeger kseeger at samba.org
Mon Jan 30 12:45:50 MST 2012


The branch, v3-5-test has been updated
       via  3394bbf s3-libsmb Do not limit read replies to NBT packet sizes
      from  f0c4e96 Fix bug 8636 - When returning an ACL without SECINFO_DACL requested, we still set SEC_DESC_DACL_PRESENT in the type field.

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


- Log -----------------------------------------------------------------
commit 3394bbf45dd219dc0293809fe2c50ad3ab7cede6
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Jan 27 13:53:34 2012 +1100

    s3-libsmb Do not limit read replies to NBT packet sizes
    
    With the posix extensions, we can read 16MB at a time, so we need to
    check the full size of the packet, not the size rounded down to the
    old NBT limit.
    
    Andrew Bartlett
    
    Fix bug #8727 (smbclient fails with posix large reads).

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

Summary of changes:
 source3/libsmb/clireadwrite.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 53ecacc..724c846 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -199,7 +199,7 @@ static void cli_read_andx_done(struct tevent_req *subreq)
 	inbuf = cli_smb_inbuf(subreq);
 	state->buf = (uint8_t *)smb_base(inbuf) + SVAL(vwv+6, 0);
 
-	if (trans_oob(smb_len(inbuf), SVAL(vwv+6, 0), state->received)
+	if (trans_oob(smb_len_large(inbuf), SVAL(vwv+6, 0), state->received)
 	    || ((state->received != 0) && (state->buf < bytes))) {
 		DEBUG(5, ("server returned invalid read&x data offset\n"));
 		tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list