1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-14 19:24:43 +03:00

82 Commits

Author SHA1 Message Date
Stefan Metzmacher
2fdbafbf54 Revert "s3:libsmb: add an option to cli_push to let the caller provide the buffers"
This reverts commit 9579a6f193f570e4ce2af80f4aac7c2f25ae5b22.

It's confusing to have a boolean to alter the behavior of cli_push
and as the new feature isn't used yet I revert it.

We can readd a extra function later.

metze
2009-03-12 11:03:50 +01:00
Stefan Metzmacher
9579a6f193 s3:libsmb: add an option to cli_push to let the caller provide the buffers
metze
2009-03-10 14:07:56 +01:00
Stefan Metzmacher
c2993f74af s3:libsmb: only treat a return 0 as end of file
metze
2009-03-10 12:46:16 +01:00
Stefan Metzmacher
7fc8086e11 s3:libsmb: fix a lot of cli_push() bugs
There were the following problems:
1.) if window_size was a multiple of the chunk_size,
    we silently dropped the last truncated chunk.
2.) if window_size was 0 pushed only the first chunk
    to the server and silently dropped the rest.
3.) we had only transferred state->num_reqs writes,
    even if there would be more data to send.

metze
2009-03-10 11:03:15 +01:00
Volker Lendecke
d3f9b0fab6 Next step disentangling async_req from NTSTATUS
Now I need to document this :-)
2009-02-02 20:15:03 +01:00
Volker Lendecke
c14b7e648b Split up async_req into a generic and a NTSTATUS specific part 2009-02-01 19:05:39 +01:00
Volker Lendecke
0dbd396862 Add a macro async_req_setup()
This streamlines setting up a multi-step async request a bit
2009-01-18 16:45:07 +01:00
Volker Lendecke
27abf6731e struct async_req doesn't really need to carry an event_context 2009-01-03 19:07:57 +01:00
Volker Lendecke
9f31468bd3 Add async cli_write_andx and cli_pull 2008-12-19 23:16:25 +01:00
Volker Lendecke
4abdd3981e Pass "bytes_alignment" up through cli_request_send
This parameter makes smb_spice_chain add padding before the bytes field
2008-12-19 14:53:29 +01:00
Volker Lendecke
42e407b300 Factor out cli_write_max_bufsize 2008-12-19 13:34:26 +01:00
Volker Lendecke
fd2bac9667 For read&x replies, check the offset 2008-12-13 10:30:02 +01:00
Volker Lendecke
7fbb64d726 Simplify async programming a bit with helper routines
Introduce async_req_is_error() and async_req_simple_recv()
2008-12-08 22:09:33 +01:00
Jelmer Vernooij
4746f79d50 Use {u,}int64_t instead of SMB_BIG_{U,}INT. 2008-10-14 01:59:36 +02:00
Volker Lendecke
f294f51bf0 Remove cli_request_get()
req->private_data==NULL at this point is definitely a bug.
(This used to be commit ce3dc9f616cafc1289a94ac7cae0beca967d836e)
2008-08-28 18:22:49 +02:00
Volker Lendecke
128524930d Add cli_pull_reply
Along the lines of cli_request_send this abstracts away the smb-level buffer
handling when parsing replies we got from the server.
(This used to be commit 253134d3aaa359fdfb665709dd5686f69af7f8fd)
2008-08-28 17:53:37 +02:00
Volker Lendecke
2650207d4a Remove cli->event_ctx, pass it explicitly
Storing the event_context as permanent state in struct cli_state creates more
complex code than necessary IMO.
(This used to be commit debb37f703075008e5ea7d34d214cfa4d0f8f916)
2008-08-28 17:53:37 +02:00
Volker Lendecke
58aa97c0d9 Refactoring: Add the routine cli_request_send()
cli_request_send() is supposed to bundle all generic SMB-header handling. This
makes cli_request_new static to async_smb.c.
(This used to be commit 7e73dd4e7622db64d30d48ba106892e0895fc188)
2008-08-28 17:53:36 +02:00
Volker Lendecke
1924e7931c Revert "Protect against short read&x replies"
This reverts commit 4ed73cbbbeff4b554cc8d28252b756241396b3a1.

... how did this end up here??

Volker
(This used to be commit 7dd9fd0956bd1c46105d1072c4774972933ab9ec)
2008-08-23 15:41:00 +02:00
Volker Lendecke
56cd17dfe1 Protect against short read&x replies
(This used to be commit 4ed73cbbbeff4b554cc8d28252b756241396b3a1)
2008-08-23 15:12:39 +02:00
Volker Lendecke
711efc06c8 cli_request_new() already gave use the req, remove a pointless function call
(This used to be commit 08e97bd369ebe3ab1fd92433b168585faea92c68)
2008-08-01 20:46:10 +02:00
Jeremy Allison
d36434f312 Security fix for CVE-2008-1105: Boundary failure when parsing SMB responses
can result in a buffer overrun.
Jeremy.
(This used to be commit 23b825e9d2c74c5b940cf4d3aa56c18692259972)
2008-05-28 09:31:42 -07:00
Jeremy Allison
b04bcefc58 Fix bug #5479, print spool shares require max_xmit to
be adhered to.
Jeremy.
(This used to be commit 478a359edead0677281a3ca4e64db6521941b0f3)
2008-05-21 12:39:08 -07:00
Volker Lendecke
b7d2e94296 Fix bug 5399
Thanks to Jason Mader!

Volker
(This used to be commit 36740f4959194cfaa98b1e37eed08f22edbda1e4)
2008-04-19 17:04:09 +02:00
Jeremy Allison
d1e99642f7 Fix bug #5326 - OS/2 servers give strange "high word" replies for print jobs.
Jeremy.
(This used to be commit d090d25cb702965b3d5e4635a26a06f2b62d235d)
2008-03-28 10:12:07 -07:00
Volker Lendecke
8f6b03b673 More ssize_t->SMB_OFF_T
(This used to be commit 8dd6458049d1b9d6849730ac19c39b049a68f302)
2008-03-28 15:32:02 +01:00
Volker Lendecke
4b3351e5dc On Solaris, size_t seems to be only 32 bit.
Fix bug 5341, thanks a lot to Karoly Vegh for testing it!

Volker
(This used to be commit 19eb8c9316b10b1277121e90d0d3ef50ee562118)
2008-03-21 13:41:42 +01:00
Volker Lendecke
b2ec8372ba !NT_STATUS_IS_OK != NT_STATUS_IS_ERR
When reading from a pipe, Windows return STATUS_BUFFER_OVERFLOW which is *not*
an error.
(This used to be commit 24018d882d1b1cfece47c533fe5bbca91de124cc)
2008-03-19 22:38:13 +01:00
Volker Lendecke
16cbc22a99 Fix bug 5334
I did not test with a zero length file :-)
(This used to be commit 7d7a73944c2dcf078f7bc8de65d575f32f9aa851)
2008-03-18 13:49:46 +01:00
Volker Lendecke
973734cde6 Correctly calculate the max read size
(This used to be commit f556c9e162e2bc0d16710e994a00edc33a146cd5)
2008-03-08 22:28:01 +01:00
Volker Lendecke
a015227490 Convert cli_read to use cli_pull
(This used to be commit d69b20111a849152a7d9108763207c813bf9068b)
2008-03-06 13:28:23 +01:00
Volker Lendecke
6244578835 Add async cli_pull support
This is the big (and potentially controversial) one. It took a phone call to
explain to metze what is going on inside cli_pull_read_done, but I would really
like everybody to understand this function. It is a very good and reasonably
complex example of async programming. If we want more asynchronism in s3, this
is what we will have to deal with :-)

Make use of it in the smbclient "get" command.

Volker
(This used to be commit 76f9b360ee1d973630d82d401eeddce858189301)
2008-03-06 13:28:23 +01:00
Jeremy Allison
f44713df4d Fix bug found by Derrell - windows returns an read return
offset of zero if return size is zero. Should fix testread
libsmbclient code.
Jeremy.
(This used to be commit df3c4648399f8d62ff6fe0013be8b89abc18f0f0)
2008-01-16 17:33:19 -08:00
Jeremy Allison
d7582b5186 Windows insists on write sizes < max_xmit on signed connections.
Jeremy.
(This used to be commit ef9b278b6289a9ecdd6b103927058f64fbb7eb97)
2008-01-14 13:46:06 -08:00
Jeremy Allison
afc93255d1 Add SMB encryption. Still fixing client decrypt but
negotiation works.
Jeremy.
(This used to be commit d78045601af787731f0737b8627450018902b104)
2007-12-26 17:12:36 -08:00
Jeremy Allison
7498e1b8c0 Ensure we don't use massive writes in pipe mode.
Jeremy.
(This used to be commit 47640fb20e42f226e7ea104076fd52547bfe1abb)
2007-11-06 14:12:38 -08:00
Jeremy Allison
329365684b Change the client library to write directly out of
the incoming buffer in the non-signed case. Speeds
up writes by over 10% or so. Complete the server
recvfile implementation.
Jeremy.
(This used to be commit 81ca5853b2475f123faab3b550f0a7b24ae3c208)
2007-11-02 12:21:34 -07:00
Jeremy Allison
f5dcac6e8e Our userlevel SMBwriteX call is non-standard in that it
sometimes uses a 12-word write and doesn't include a pad
byte (as Windows does). Fix this so that we are identical
to Windows clients. This will make recvfile processing
much easier to detect (as we can just read a standard
writeX header length to decide).
Jeremy.
(This used to be commit 3d3d1b806aef3617abaac46daf230ed32076e2ce)
2007-10-30 12:54:39 -07:00
Jeremy Allison
30191d1a57 RIP BOOL. Convert BOOL -> bool. I found a few interesting
bugs in various places whilst doing this (places that assumed
BOOL == int). I also need to fix the Samba4 pidl generation
(next checkin).
Jeremy.
(This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-18 17:40:25 -07:00
Gerald (Jerry) Carter
e5a951325a [GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.
(This used to be commit 5c6c8e1fe93f340005110a7833946191659d88ab)
2007-10-10 15:34:30 -05:00
Andrew Tridgell
5e54558c6d r23784: use the GPLv3 boilerplate as recommended by the FSF and the license text
(This used to be commit b0132e94fc5fef936aa766fb99a306b3628e9f07)
2007-10-10 12:28:22 -05:00
Jeremy Allison
d824b98f80 r23779: Change from v2 or later to v3 or later.
Jeremy.
(This used to be commit 407e6e695b8366369b7c76af1ff76869b45347b3)
2007-10-10 12:28:20 -05:00
Jeremy Allison
4d6caa09e2 r23148: Fix old old bug in cli_smbwrite() (not incrementing
data being sent). Patch from mnix@wanm.com.au.
Jeremy.
(This used to be commit 2524d85465ba5406e684199c10f59e685ab860b5)
2007-10-10 12:22:48 -05:00
Jeremy Allison
32106b2395 r22920: Add in the UNIX capability for 24-bit readX, as discussed
with the Apple guys and Linux kernel guys. Still looking
at how to do writeX as there's no recvfile().
Jeremy.
(This used to be commit a53268fb2082de586e2df250d8ddfcff53379102)
2007-10-10 12:22:08 -05:00
Jeremy Allison
0829e1ad1c r22391: Looks bigger than it is. Make "inbuf" available
to all callers of smb_setlen (via set_message()
calls). This will allow the server to reflect back
the correct encryption context.
Jeremy.
(This used to be commit 2d80a96120a5fe2fe726f00746d36d85044c4bdb)
2007-10-10 12:19:30 -05:00
Volker Lendecke
02eea79624 r17333: Some C++ warnings
(This used to be commit be9aaffdaccae06c8c035eaf31862e34b7cfbe38)
2007-10-10 11:38:26 -05:00
Jeremy Allison
7b75d2c650 r15162: Patch for bug #3668. Windows has a bug with LARGE_READX
where if you ask for exactly 64k bytes it returns 0.
Jeremy.
(This used to be commit dcef65acb5bc08ea4b61ef490a518b7e668ff2ee)
2007-10-10 11:16:27 -05:00
Jeremy Allison
894358a8f3 r13915: Fixed a very interesting class of realloc() bugs found by Coverity.
realloc can return NULL in one of two cases - (1) the realloc failed,
(2) realloc succeeded but the new size requested was zero, in which
case this is identical to a free() call.

The error paths dealing with these two cases should be different,
but mostly weren't. Secondly the standard idiom for dealing with
realloc when you know the new size is non-zero is the following :

 tmp = realloc(p, size);
 if (!tmp) {
    SAFE_FREE(p);
    return error;
 } else {
    p = tmp;
 }

However, there were *many* *many* places in Samba where we were
using the old (broken) idiom of :

 p = realloc(p, size)
 if (!p) {
    return error;
 }

which will leak the memory pointed to by p on realloc fail.

This commit (hopefully) fixes all these cases by moving to
a standard idiom of :

 p = SMB_REALLOC(p, size)
 if (!p) {
    return error;
 }

Where if the realloc returns null due to the realloc failing
or size == 0 we *guarentee* that the storage pointed to by p
has been freed. This allows me to remove a lot of code that
was dealing with the standard (more verbose) method that required
a tmp pointer. This is almost always what you want. When a
realloc fails you never usually want the old memory, you
want to free it and get into your error processing asap.

For the 11 remaining cases where we really do need to keep the
old pointer I have invented the new macro SMB_REALLOC_KEEP_OLD_ON_ERROR,
which can be used as follows :

 tmp = SMB_REALLOC_KEEP_OLD_ON_ERROR(p, size);
 if (!tmp) {
    SAFE_FREE(p);
    return error;
 } else {
    p = tmp;
 }

SMB_REALLOC_KEEP_OLD_ON_ERROR guarentees never to free the
pointer p, even on size == 0 or realloc fail. All this is
done by a hidden extra argument to Realloc(), BOOL free_old_on_error
which is set appropriately by the SMB_REALLOC and SMB_REALLOC_KEEP_OLD_ON_ERROR
macros (and their array counterparts).

It remains to be seen what this will do to our Coverity bug count :-).

Jeremy.
(This used to be commit 1d710d06a214f3f1740e80e0bffd6aab44aac2b0)
2007-10-10 11:10:59 -05:00
Jeremy Allison
7756059d38 r13119: Fix for #1779 from William Jojo <jojowil@hvcc.edu>
Jeremy.
(This used to be commit 103cac7dd314117b15e27fd263a64beeb36ed6e6)
2007-10-10 11:06:14 -05:00
Gerald Carter
54abd2aa66 r10656: BIG merge from trunk. Features not copied over
* \PIPE\unixinfo
* winbindd's {group,alias}membership new functions
* winbindd's lookupsids() functionality
* swat (trunk changes to be reverted as per discussion with Deryck)
(This used to be commit 939c3cb5d78e3a2236209b296aa8aba8bdce32d3)
2007-10-10 11:04:48 -05:00