diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-17 13:05:25 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-17 13:05:25 +0200 |
| commit | dd0da89e841e5df0c1fe27122df0c1644278c65e (patch) | |
| tree | 75de1500ca458d977c36831491a9495738da9c2c /source4/smb_server | |
| parent | 0197b8e0ff8dc26eeb71dccf61d8937c63bacff5 (diff) | |
| parent | 4d8f3f190215edcdbeb1725cccdc962dc68cc1a0 (diff) | |
| download | samba-dd0da89e841e5df0c1fe27122df0c1644278c65e.tar.gz samba-dd0da89e841e5df0c1fe27122df0c1644278c65e.tar.bz2 samba-dd0da89e841e5df0c1fe27122df0c1644278c65e.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit ece878c1f9251b83598508e23ce0015b4db72f0a)
Diffstat (limited to 'source4/smb_server')
| -rw-r--r-- | source4/smb_server/smb2/fileio.c | 1 | ||||
| -rw-r--r-- | source4/smb_server/smb2/negprot.c | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source4/smb_server/smb2/fileio.c b/source4/smb_server/smb2/fileio.c index 8f8b4e771c..af1a413009 100644 --- a/source4/smb_server/smb2/fileio.c +++ b/source4/smb_server/smb2/fileio.c @@ -79,6 +79,7 @@ void smb2srv_create_recv(struct smb2srv_request *req) SMB2SRV_CHECK(smb2_pull_o32s32_blob(&req->in, io, req->in.body+0x30, &blob)); /* TODO: parse the blob */ ZERO_STRUCT(io->smb2.in.eas); + ZERO_STRUCT(io->smb2.in.blobs); /* the VFS backend does not yet handle NULL filenames */ if (io->smb2.in.fname == NULL) { diff --git a/source4/smb_server/smb2/negprot.c b/source4/smb_server/smb2/negprot.c index e7352f7c42..4479ae2da1 100644 --- a/source4/smb_server/smb2/negprot.c +++ b/source4/smb_server/smb2/negprot.c @@ -114,9 +114,12 @@ static NTSTATUS smb2srv_negprot_backend(struct smb2srv_request *req, struct smb2 io->out.security_mode = 0; /* no signing yet */ io->out.dialect_revision = SMB2_DIALECT_REVISION; io->out.capabilities = 0; - io->out.max_transact_size = 0x10000; - io->out.max_read_size = 0x10000; - io->out.max_write_size = 0x10000; + io->out.max_transact_size = lp_parm_ulong(req->smb_conn->lp_ctx, NULL, + "smb2", "max transaction size", 0x10000); + io->out.max_read_size = lp_parm_ulong(req->smb_conn->lp_ctx, NULL, + "smb2", "max read size", 0x10000); + io->out.max_write_size = lp_parm_ulong(req->smb_conn->lp_ctx, NULL, + "smb2", "max write size", 0x10000); io->out.system_time = timeval_to_nttime(¤t_time); io->out.server_start_time = timeval_to_nttime(&boot_time); io->out.reserved2 = 0; |