[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Wed May 11 16:37:03 UTC 2016


The branch, master has been updated
       via  7efbe11 s3:libsmb/clifile use correct value for MaxParameterCount for setting EAs
      from  15f191a ldb-samba: Add "secret" as a value to hide in LDIF files

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


- Log -----------------------------------------------------------------
commit 7efbe1139796bb708176cd8dddb206a0f271ec1b
Author: Christian Ambach <ambi at samba.org>
Date:   Tue May 10 19:47:02 2016 +0200

    s3:libsmb/clifile use correct value for MaxParameterCount for setting EAs
    
    Windows servers will refuse trans2 requests which use excessive
    request parameters. From [MS-CIFS|:
    <239> Section 3.3.5.2.5: Windows NT servers fail a transaction request with
    STATUS_INSUFF_SERVER_RESOURCES, if (SetupCount + MaxSetupCount +
    TotalParameterCount + MaxParameterCount + TotalDataCount + MaxDataCount)
    is greater than 65*1024.
    
    When attempting to set a large list of EAs for a file, this limit can be
    hit when using CLI_BUFFER_SIZE as MaxDataCount
    while the TRANS2_SET_PATH_INFORMATION response has no data reply,
    only parameters (section 2.2.6.7.2).
    
    Be as minimal as possible here to allow a maximum number of EAs to
    be written.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=11354
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed May 11 18:35:59 CEST 2016 on sn-devel-144

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

Summary of changes:
 source3/libsmb/clifile.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 0e790cd..684f263 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -4593,7 +4593,7 @@ static NTSTATUS cli_set_ea(struct cli_state *cli, uint16_t setup_val,
 	status = cli_trans(talloc_tos(), cli, SMBtrans2, NULL, -1, 0, 0,
 			   setup, 1, 0,
 			   param, param_len, 2,
-			   data,  data_len, CLI_BUFFER_SIZE,
+			   data,  data_len, 0,
 			   NULL,
 			   NULL, 0, NULL, /* rsetup */
 			   NULL, 0, NULL, /* rparam */


-- 
Samba Shared Repository



More information about the samba-cvs mailing list