Stefan Metzmacher [Wed, 12 Oct 2011 16:34:26 +0000 (18:34 +0200)]
s4:torture/smb2: we only support 64KB reads/writes for now
We don't have multi-credit support yet.
metze
(cherry picked from commit
77f739f03a32965b676d97a6f082bb3e023014ef)
Stefan Metzmacher [Fri, 23 Sep 2011 04:37:35 +0000 (06:37 +0200)]
s3:smbd: disconnect the socket if we got an unexpected request
If we got a SMB2_OP_NEGPROT after the protocol is already negotiated
or if we got a non SMB2_OP_NEGPROT before the protocol was negotiated
we should close the connection (as windows does).
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Sep 23 12:30:50 CEST 2011 on sn-devel-104
(cherry picked from commit
5494856294384df4360d85e68abc03c43dc16e06)
Stefan Metzmacher [Mon, 5 Sep 2011 10:14:06 +0000 (12:14 +0200)]
s3:smb2_server: max_trans, max_read and max_write are limited to 64 kilobytes
Only if SMB2_CAP_LARGE_MTU is supported we should announce larger limits.
metze
(cherry picked from commit
e603929b9801ad6cc47dead19d27b42fe46489c7)
Karolin Seeger [Wed, 12 Oct 2011 19:56:27 +0000 (21:56 +0200)]
WHATSNEW: Update changes since 3.6.0.
Karolin
Volodymyr Khomenko [Wed, 12 Oct 2011 16:57:57 +0000 (09:57 -0700)]
Fix bug #8515 - Empty CIFS share can be blocked for other clients by deleting it via empty path (DELETE_PENDING until the last client)
Disallow "." in can_set_delete_on_close().
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Oct 12 21:07:27 CEST 2011 on sn-devel-104
(cherry picked from commit
bd260f03ab492d03c2890db47dc6fb4f1b824a1a)
Karolin Seeger [Wed, 12 Oct 2011 19:44:52 +0000 (21:44 +0200)]
WHATSNEW: Update changes since 3.6.0.
Karolin
David Disseldorp [Wed, 28 Sep 2011 12:45:42 +0000 (14:45 +0200)]
s3-smb2_server: fix ioctl InputOffset checking
Currently the InputOffset is always check to point to the input data
buffer, regardless of whether input data is present.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit
dbcd59f46b0d2125dfb6eb82b3d92be228c6ae4b)
The last 22 patches addres bug #8520 (Fix SMB2 SMB2_OP_GETINFO and
SMB2_OP_IOCTL parsing requirements).
David Disseldorp [Sun, 25 Sep 2011 21:39:07 +0000 (23:39 +0200)]
s3-smb2_server: SMB2_OP_IOCTL doesn't require at least 1 dyn byte
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit
18482957daa2e2122ef39426a8fff167df3c9377)
Stefan Metzmacher [Wed, 14 Sep 2011 11:04:28 +0000 (13:04 +0200)]
s3:smb2_server: SMB2_OP_GETINFO doesn't require at least 1 dyn byte
metze
(cherry picked from commit
563fa741f6a34a1300c81a8474ca87346a9f5cca)
Stefan Metzmacher [Tue, 6 Sep 2011 12:14:52 +0000 (14:14 +0200)]
s3:smb2_server: return OBJECT_NAME_INVALID if the path is terminated in SMB2_FIND/QUERY_DIRECTORY
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Wed Sep 7 12:15:51 CEST 2011 on sn-devel-104
(cherry picked from commit
9bc4decc1cba701926fc8081c3903aac754a6f51)
Stefan Metzmacher [Tue, 6 Sep 2011 12:14:52 +0000 (14:14 +0200)]
s3:smb2_server: return OBJECT_NAME_INVALID if the path is terminated in SMB2_CREATE
metze
(cherry picked from commit
1bc93c2605e14104237bb100db1d8acb1e7fe389)
Stefan Metzmacher [Tue, 6 Sep 2011 12:14:52 +0000 (14:14 +0200)]
s3:smb2_server: return BAD_NETWORK_NAME if the path is terminated in SMB2_TCON
metze
(cherry picked from commit
68b33aa61ac393c2737969f8449adce3e3096d73)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_write.c
metze
(cherry picked from commit
1a726b88ec74962d0317740bbdf576ddcffb52bc)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_setinfo.c
metze
(cherry picked from commit
3643a05ba63ac5d8466dc8391b5d05efeedb5ac4)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_read.c
metze
(cherry picked from commit
f3a8d65bdfe496f080a74eb7104500bd8e2b0179)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_notify.c
metze
(cherry picked from commit
c6480366e551d1dc683c2648bd897bdc7c1b90df)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_lock.c
metze
(cherry picked from commit
a358eee2d8670d4a1675e82562fa704fa45a71e6)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_keepalive.c
metze
(cherry picked from commit
22d479f75794b7c5fcac2fd47fbfd767700507d6)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_ioctl.c
metze
(cherry picked from commit
29b3601c028b8861102b1d988285c78fc17f3b8e)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_getinfo.c
metze
(cherry picked from commit
880eafd7e83ba326be7036605179e8de746f4312)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_flush.c
metze
(cherry picked from commit
440f702aa9a020f8cfe13037b7af1ba0dadf86f2)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_find.c
metze
(cherry picked from commit
bc95ab99dc84fa6d567a7d4e803552363bbc07a9)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_create.c
metze
(cherry picked from commit
251815bfd395398857cb60c0b89710ddce7ab19f)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_close.c
metze
(cherry picked from commit
e09b3940a769806dcc17d24079375f5d53eca26a)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_break.c
metze
(cherry picked from commit
9da2f72d471460d9c953e9cee84c9cfa3611e89e)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_tcon.c
metze
(cherry picked from commit
02f7c37e671c7950619c000b73c5a09ce31c68ac)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_sesssetup.c
metze
(cherry picked from commit
d280d9f945be2d658694c6d4503822e99dc953b5)
Stefan Metzmacher [Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)]
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_negprot.c
metze
(cherry picked from commit
7ec3a35d2a67ca93a49094f07a12b0e37cec1661)
Stefan Metzmacher [Mon, 3 Oct 2011 21:50:48 +0000 (14:50 -0700)]
s3:smb2_server: add smbd_smb2_request_verify_sizes()
metze.
Christian Ambach [Mon, 10 Oct 2011 15:48:18 +0000 (17:48 +0200)]
s3:smb2_create: fix allocation size return value when opening existing files
at least on GPFS, using the stat information gave wrong results
example: FileInfo gave
12582912000, Create Response gave
25769803776000
This makes the create part use the same method as fileinfo,
matching up the replies of both calls
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Mon Oct 10 21:49:53 CEST 2011 on sn-devel-104
(cherry picked from commit
ec0c1f2c34ea520b4a7d636ba284a9c7d3ecd96f)
Fix bug #8518 (SMB2 create call returns incorrect file allocation size).
Jeremy Allison [Wed, 21 Sep 2011 20:47:22 +0000 (13:47 -0700)]
Remove extraneous debug code.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Sep 22 00:22:12 CEST 2011 on sn-devel-104
Jeremy Allison [Wed, 21 Sep 2011 18:40:01 +0000 (11:40 -0700)]
Fix bug #8474 - SMB2 create doesn't cope with an Apple client using NULL blob in create
Cope with zero length data_offset and data_length values.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Sep 21 22:12:40 CEST 2011 on sn-devel-104
Jeremy Allison [Wed, 7 Sep 2011 21:57:11 +0000 (14:57 -0700)]
Tidy up previous patch for bug #8442 - NFSv4 DENY ACLs always include SYNCHRONIZE flag - blocking renames.
aceType is an enum field, not a bitmask.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Sep 8 03:34:39 CEST 2011 on sn-devel-104
(cherry picked from commit
0aa6751e919d842cdae044be26f6da725063eac2)
Ira Cooper [Wed, 7 Sep 2011 19:24:22 +0000 (12:24 -0700)]
Fix bug #8442 - NFSv4 DENY ACLs always include SYNCHRONIZE flag - blocking renames.
Thanks to Youzhong Yang for discovering this issue.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Sep 7 22:56:06 CEST 2011 on sn-devel-104
(cherry picked from commit
600451da33728cbd377b122c85cf146f5b319998)
Karolin Seeger [Sat, 8 Oct 2011 18:54:37 +0000 (20:54 +0200)]
s3-docs: Fix typo.
Karolin
Autobuild-User: Karolin Seeger <kseeger@samba.org>
Autobuild-Date: Sat Oct 8 22:27:07 CEST 2011 on sn-devel-104
(cherry picked from commit
851d6625d5e08ac9659a6d23d105f9e0c47f9692)
Karolin Seeger [Sat, 8 Oct 2011 18:53:18 +0000 (20:53 +0200)]
s3-docs: Fix bug #7908.
Fix typo.
Thanks to John Bradshaw for reporting!
Karolin
(cherry picked from commit
8aaa27754663a55f45facc18783eea458205d8a5)
Bram [Thu, 29 Sep 2011 09:28:03 +0000 (11:28 +0200)]
Bug 7551: Return error of cli_push when 'put - /some/file' is used
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Sep 29 23:47:02 CEST 2011 on sn-devel-104
(cherry picked from commit
d883cc664cac81633a60e5b04f99f23a3577ae65)
Jeremy Allison [Fri, 7 Oct 2011 18:09:44 +0000 (11:09 -0700)]
Fix bug #8509 - Read-only handles on SAMR allow SAMR_DOMAIN_ACCESS_CREATE_USER.
Not a security issue as we also check inside _samr_CreateUser2.
Thanks to Andreas Schneider <asn@samba.org> for finding and testing this.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Oct 7 21:51:27 CEST 2011 on sn-devel-104
(cherry picked from commit
c80ba57169cee2ec66e8afe3616956c17958a3ae)
Jeremy Allison [Tue, 4 Oct 2011 21:46:00 +0000 (14:46 -0700)]
Fix bug #8507 - smbd doesn't correctly honor the "force create mode" bits from a cifsfs create.
Don't manipulate the new_dos_attributes bits until we know it's not a POSIX open.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Oct 5 01:19:17 CEST 2011 on sn-devel-104
(cherry picked from commit
f93fd128eb623e324459806a34052bd40afe82e5)
Jeremy Allison [Thu, 8 Sep 2011 20:48:27 +0000 (13:48 -0700)]
Second part of fix for bug #8443 - Default user entry is set to minimal permissions on incoming ACL change with no user specified.
Be smarter about setting default permissions when a ACL_USER_OBJ isn't given. Use the principle of least surprises for the user.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Sep 9 00:26:08 CEST 2011 on sn-devel-104
(cherry picked from commit
e30b8c72def13e2abc14858ea64eb849ea665b80)
Jeremy Allison [Thu, 8 Sep 2011 19:51:18 +0000 (12:51 -0700)]
First part of fix for bug #8443 - Default user entry is set to minimal permissions on incoming ACL change with no user specified.
create_default_mode() is not needed - it's taken care of by code
inside ensure_canon_entry_valid().
(cherry picked from commit
793bd527fdd0b188aba8f3b4bffd8fa8f69a9cd1)
Jeremy Allison [Fri, 2 Sep 2011 19:22:34 +0000 (12:22 -0700)]
Part 3 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set (Invalid argument)
Don't call check_owning_objs() to convert ACL_USER->ACL_USER_OBJ and
AC_GROUP->ACL_GROUP_OBJ for default (directory) ACLs, we do this separately
inside ensure_canon_entry_valid().
(cherry picked from commit
c528fc5cacaae7e0e83041eb98150052b436071e)
Jeremy Allison [Fri, 2 Sep 2011 18:58:56 +0000 (11:58 -0700)]
Part 2 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set (Invalid argument)
Only map CREATOR_OWNER/CREATOR_GROUP to ACL_USER_OBJ/ACL_GROUP_OBJ in
a default(directory) ACL set.
(cherry picked from commit
a5038ace24559bb02eec8262d3af5b5e78634d16)
Jeremy Allison [Fri, 2 Sep 2011 18:21:08 +0000 (11:21 -0700)]
Part 1 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set (Invalid argument)
Remove the code I added for bug "6878 - Cannot change ACL's inherit flag". It is incorrect
and causes the POSIX ACL ACL_USER_OBJ duplication.
(cherry picked from commit
2b935b49f3d975759eb1cbcf2b11bf7c9d982804)
Jeremy Allison [Wed, 21 Sep 2011 20:33:38 +0000 (13:33 -0700)]
Fix bug #8458] - IE9 on Windows 7 cannot download files to samba 3.5.11 share
Handle the SECINFO_LABEL flag in the same was as Win2k3.
(cherry picked from commit
893497ee169ba5455cd70458a339e60544e171d7)
Jeremy Allison [Fri, 30 Sep 2011 20:35:59 +0000 (13:35 -0700)]
Fix bug #8493 - DFS breaks zip file extracting unless "follow symlinks = no" set
If a client sends a mangled name as part of a DFS path, use the
post-mangled name for the pathname walk, not the mangled name.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Sat Oct 1 00:45:59 CEST 2011 on sn-devel-104
Karolin Seeger [Mon, 6 Jun 2011 17:58:22 +0000 (19:58 +0200)]
s3-docs: Fix typos.
Thanks to Samba-JP oota <ribbon@samba.gr.jp> for reporting!
Karolin
Autobuild-User: Karolin Seeger <kseeger@samba.org>
Autobuild-Date: Fri Sep 30 23:12:35 CEST 2011 on sn-devel-104
(cherry picked from commit
5c569a97ab477a324a96aae7f58770ccbe2572de)
Stefan Metzmacher [Wed, 28 Sep 2011 06:28:08 +0000 (08:28 +0200)]
s3:smb2_server: SMB2_OP_CANCEL requests don't have to be signed
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Sep 29 02:58:41 CEST 2011 on sn-devel-104
(cherry picked from commit
ea00f0e452f64868fdc78cf0dc8e9ce3af19fe32)
Fix bug #8503 (The SMB2 server should ignore signing on CANCEL requests).
Karolin Seeger [Wed, 28 Sep 2011 18:17:42 +0000 (20:17 +0200)]
s3-docs: Remove "experimental" label on VFS ACL modules
in the documentation also (bug #8494).
Karolin
Jeremy Allison [Tue, 27 Sep 2011 17:23:08 +0000 (10:23 -0700)]
These modules are no longer experimental but production-ready (especially the acl_xattr code). Remove the "experimental" tag.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue Sep 27 21:00:12 CEST 2011 on sn-devel-104
(cherry picked from commit
fa2236c066890b687483408ed0d82a4bb1f95157)
Fix bug #8494 (Remove "experimental" label on VFS ACL modules).
David Disseldorp [Fri, 23 Sep 2011 18:46:06 +0000 (11:46 -0700)]
Fix bug 8480 - acl_xattr can free an invalid pointer if no blob is loaded.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Sep 23 22:20:55 CEST 2011 on sn-devel-104
(cherry picked from commit
ca8c25abebb8715176f68be9916217db9a8400dd)
Stefan Metzmacher [Fri, 23 Sep 2011 04:08:51 +0000 (06:08 +0200)]
s3:smbd: don't call smbd_terminate_connection in smb2_validate_message_id() (bug #8476)
Only return false and the caller will terminate the connection.
metze
(cherry picked from commit
02d83d8fd4d21825110fd7da1ccb570a26e66ca6)
Part of a fix for bug #8476 (Samba asserts when SMB2 client breaks the crediting
rules.)
Jeremy Allison [Thu, 22 Sep 2011 16:06:48 +0000 (09:06 -0700)]
Fix bug #8476 - Samba asserts when SMB2 client breaks the crediting rules.
Just drop the connection, not SMB_ASSERT.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Sep 22 19:41:31 CEST 2011 on sn-devel-104
(cherry picked from commit
d50fa9c21e1c3b6f7126c33e24966099c7567225)
Günther Deschner [Wed, 21 Sep 2011 15:28:58 +0000 (17:28 +0200)]
s3-libnet: allow to use default krb5 ccache in libnet_Join/libnet_Unjoin.
We force using a MEMORY ccache though in the wkssvc server.
Guenther
Part of a fix for bug #7465 (net ads join -k didn't work if KRB5CCNAME is not
set).
Karolin Seeger [Mon, 26 Sep 2011 19:10:46 +0000 (21:10 +0200)]
Revert "s3-libnet: allow to use default krb5 ccache in libnet_Join/libnet_Unjoin."
This reverts commit
050123d9b6ae8fd69ed58380d8bdf210c38556fc.
This commit seems to break the build.
Jeremy Allison [Wed, 21 Sep 2011 18:30:06 +0000 (11:30 -0700)]
Fix bug #8473 - smb2_find uses a hard coded max reply size of 0x10000 instead of smb2_max_trans.
Use lp_smb2_max_trans() instead of 0x10000.
(cherry picked from commit
e68ebe600d9349e16e83aeb8e6ae8647c117d098)
Günther Deschner [Mon, 26 Sep 2011 14:25:12 +0000 (16:25 +0200)]
s3-netapi: allow to use default krb5 credential cache for libnetapi users.
Guenther
Günther Deschner [Wed, 21 Sep 2011 15:28:58 +0000 (17:28 +0200)]
s3-libnet: allow to use default krb5 ccache in libnet_Join/libnet_Unjoin.
We force using a MEMORY ccache though in the wkssvc server.
Guenther
Günther Deschner [Tue, 20 Sep 2011 12:13:36 +0000 (14:13 +0200)]
s3-docs: document -k switch in net manpage.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue Sep 20 15:47:00 CEST 2011 on sn-devel-104
(cherry picked from commit
8dda773bd7eea1d163282b1f3c5e90cbff8a1003)
Jeremy Allison [Thu, 22 Sep 2011 20:42:56 +0000 (13:42 -0700)]
Fix bug #8477 - Map to guest can return uninitialized blob of data.
Found by Codenomicon at SNIA SDC.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Sep 23 03:19:46 CEST 2011 on sn-devel-104
(cherry picked from commit
f0f91d0117b2ccf778382e61a411b5e4f0ea2b14)
Günther Deschner [Thu, 25 Aug 2011 11:39:25 +0000 (13:39 +0200)]
s3-registry: fix bug #8401 - registry/reg_format.c must include includes.h.
Guenther
(cherry picked from commit
e00a6c40bf13d9c1225022129e4cb1d617aa49bf)
Jeremy Allison [Wed, 14 Sep 2011 18:55:16 +0000 (11:55 -0700)]
Fix bug #8453 - smbclient segfaults when dialect option -m is used for legacy dialects
Ensure we have valid pointers.
Karolin Seeger [Fri, 16 Sep 2011 19:37:10 +0000 (21:37 +0200)]
WHATSNEW: Add changes since 3.6.0.
To be completed.
Karolin
Jeremy Allison [Wed, 14 Sep 2011 00:03:46 +0000 (17:03 -0700)]
Fix bug #8229 - git patch attached against 3.6.0-rc2 to fix 'widelinks' regression intro'd in 3.2
Add "allow insecure widelinks" to re-enable the ability (requested
by some sites) to have "widelinks = yes" and "unix extensions = yes".
Based on an original patch by Linda Walsh <samba@tlinx.org>
Jeremy Allison [Wed, 31 Aug 2011 00:37:19 +0000 (17:37 -0700)]
Fix bug 8429 - Compound SMB2 requests on an IPC connection can corrupt the reply stream.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Aug 31 21:18:11 CEST 2011 on sn-devel-104
(cherry picked from commit
786fe9fab223723e4d2340f285592b2a44945d73)
Andreas Schneider [Tue, 6 Sep 2011 12:09:47 +0000 (14:09 +0200)]
s3-spoolss: Fix bug #8351 forms migration.
Don't fail if the form already exists (or is builtin now).
Signed-off-by: Andreas Schneider <asn@samba.org>
Stefan Metzmacher [Mon, 12 Sep 2011 19:06:53 +0000 (12:06 -0700)]
s3:libsmb: check the wct of the incoming SMBnegprot responses
metze
Fix bug #8452 (negprot reply needs to check vwv vector length).
The corresponding commit in master is
85332eb1c721d585e1a33101bddafdca4073e10f.
Volker Lendecke [Wed, 31 Aug 2011 13:06:35 +0000 (15:06 +0200)]
s3: Do not fork the echo handler for smb2
If a smb1 negprot negotiated smb2 we forked the echo responder. This will
eventually lead to a panic from
[2011/08/30 10:33:29.212578, 0, pid=
3846917] smbd/smb2_server.c:243(smbd_smb2_request_create)
Invalid SMB packet: first request: 0x0009
because from the echo responder we always read using the normal smb1 protocol
handling routine. If that is a bit down the smb2 stream, we get a non-negprot
packet and panic.
BTW, the echo responder is not required for smb2 anyway, Microsoft confirmed
that it probes the server liveness using TCP keepalives and not smb2 echo
requests.
The last 2 patches address bug #8334 (smb2: smbd logs Invalid SMB packet: first
request: 0x0008 and crashes).
Volker Lendecke [Fri, 20 May 2011 11:07:17 +0000 (13:07 +0200)]
s3: Fork the echo handler only after SMB1 negprot is done
This enables activating the echo responder also if SMB2 is enabled, albeit it
will only be used for SMB1 at this moment.
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Fri May 20 15:06:03 CEST 2011 on sn-devel-104
Andreas Schneider [Fri, 2 Sep 2011 15:03:43 +0000 (17:03 +0200)]
s3-spoolss: Fix bug #8236 empty notify servername.
Signed-off-by: Andreas Schneider <asn@samba.org>
Stefan Metzmacher [Thu, 25 Aug 2011 21:33:41 +0000 (23:33 +0200)]
s3:smb2_server: keep compound_related on struct smbd_smb2_request
metze
(cherry picked from commit
0d450d166bab952daf37d922e5c2e5cac16f1cc3)
The last 3 patches address bug #8407 (SMB2 server can return requests
out-of-order when processing a compound request).
Jeremy Allison [Fri, 26 Aug 2011 21:23:26 +0000 (14:23 -0700)]
Based on metze's fix for Bug 8407 - SMB2 server can return requests out-of-order when processing a compound request.
(cherry picked from commit
726b4685aa25b0b3b4470bfec5d514fb2db7a95e)
Stefan Metzmacher [Fri, 5 Aug 2011 18:34:43 +0000 (20:34 +0200)]
s3:smb2_server: make sure we prefer responses over requests on the client socket
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Aug 12 16:46:43 CEST 2011 on sn-devel-104
(cherry picked from commit
42cde0480bd6a5e2dddaa66917e1fa71e6a4edcd)
Volker Lendecke [Thu, 1 Sep 2011 14:55:03 +0000 (16:55 +0200)]
Fix bug 8433, segfault in iconv.c
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Thu Sep 1 18:25:34 CEST 2011 on sn-devel-104
(cherry picked from commit
1d4de78f567e908e0acc218630fceb0884b07d65)
Christian Ambach [Tue, 30 Aug 2011 15:39:56 +0000 (17:39 +0200)]
s3:smb2 fix Bug 8428 - wrong reply to DHnC (durable handle reconnect)
According to [MS-SMB2] 3.3.5.9.7
(http://msdn.microsoft.com/en-us/library/
cc246784%28v=PROT.13%29.aspx),
smbd must reply with NT_STATUS_OBJECT_NAME_NOT_FOUND as it does not
support durable file-handles yet.
I have seen w2k8r2 running xcopy /C ending up in an endless loop
trying to get back the original file handle from smbd sending the same
requests over and over.
Metze, Jeremy, please check!
Volker Lendecke [Thu, 25 Aug 2011 18:13:09 +0000 (20:13 +0200)]
s3: Fix getent group if trusted domains are not reachable
Fix bug #8420 (wb_group_members: non-resistance against garbage).
Jeremy Allison [Mon, 29 Aug 2011 23:47:16 +0000 (16:47 -0700)]
Fix bug 8412 - Microsoft Office 2007 (Microsoft Word) fails to save as on a Samba share with SMB2. (cherry picked from commit
dec3b21cd1737b317749e7ebced5aa1c2115ebdf)
Volker Lendecke [Fri, 26 Aug 2011 09:38:21 +0000 (11:38 +0200)]
s3: Use sys_read in fork_domain_child
I've seen
[2011/08/26 01:44:10.872057, 1] winbindd/winbindd_dual.c:1336(fork_domain_child)
fork_domain_child: Could not read child status: nread=-1, error=Interrupted system call
on a customer box. Not good.
(cherry picked from commit
964e809ce2069ad888e0fb12dfe51bac5a461508)
The last 3 patches address bug #8409 (
f7d97868 created a new race condition).
Volker Lendecke [Fri, 26 Aug 2011 09:39:41 +0000 (11:39 +0200)]
s3: Use sys_write in fork_domain_child
Counterpart for last checkin. A lot less likely, but not impossible in a child.
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Fri Aug 26 13:14:27 CEST 2011 on sn-devel-104
(cherry picked from commit
e0e3d215b1902ecbeb3d469af9a196856711921e)
Volker Lendecke [Fri, 26 Aug 2011 14:54:18 +0000 (16:54 +0200)]
s3: Fix a winbind race leading to 100% CPU
This fixes a race condition that leads to the winbindd_children list becoming
corrupted. It happens when on a busy winbind SIGCHLD is a bit late.
Imagine a winbind with multiple requests in the queue for a single child. Child
dies, and before the SIGCHLD handler is called we find the socket to be dead.
wb_child_request_done is called, receiving an error from wb_simple_trans_recv.
It closes the socket. Then immediately the wb_child_request_trigger will do
another fork_domain_child before the signal handler is called. This means that
we do another fork_domain_child, we have child->sock==-1 at this point.
fork_domain_child will do a DLIST_ADD(winbindd_children, child) a second time
where the child is already part of that list. This corrupts the list. Then the
signal handler kicks in, spinning in
for (child = winbindd_children; child != NULL; child = child->next) {
forever. Not good. This patch makes sure that both conditions (sock==-1 and not
part of the list) for a winbindd_child struct match up.
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Fri Aug 26 18:51:24 CEST 2011 on sn-devel-104
(cherry picked from commit
ed058f4dc3e059967f3c0538bc220866e9c63588)
SATOH Fumiyasu [Mon, 22 Aug 2011 04:48:40 +0000 (13:48 +0900)]
s3: Fix the build of vfs_aixacl2.c
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Thu Aug 25 23:06:12 CEST 2011 on sn-devel-104
(cherry picked from commit
faa769ec19b6486675048734837a6e2237d6f0a4)
Fix bug #8390 (vfs_aixacl2.c needs system/filesys.h).
Volker Lendecke [Mon, 22 Aug 2011 12:16:26 +0000 (14:16 +0200)]
s3: Fix bug 8385
Poll and select behave differently regarding error handling. When doing the
connect(2), we can not rely on poll telling us both readability and writability
upon error. Just always try a second connect(2). At least on Linux it returns 0
when it succeeded.
Signed-off-by: Jeremy Allison <jra@samba.org>
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Aug 25 19:39:12 CEST 2011 on sn-devel-104
(cherry picked from commit
50e30afa608dfdeae8a260730ead9761ed424dad)
Jeremy Allison [Mon, 29 Aug 2011 23:46:15 +0000 (16:46 -0700)]
Fix bug Bug 8422 - Infinite loop in ACL module code.
Missing assignment means this loop will never terminate. Need to be applied
to 3.5.x and 3.6.1.
(cherry picked from commit
218cccfdf1820a9840a5cbc7df3915b6b58a762d)
Ira Cooper [Mon, 22 Aug 2011 19:46:41 +0000 (12:46 -0700)]
Fix bug #8395 - optimize serverid_exists() for Solaris.
jra asked:
Do you have any idea on how many calls it saves,
and what help the optimization gives ?
As far as calls: Not 100% sure, dtrace pointed the issue out to me, and when I
saw 10-50%(Or more), I looked for an easy fix.
The real expense here is the fnctl locks on the database. That's pretty
painful. 1000ns per call, and probably 3-4 calls in that chain. So it doesn't
take much to come out ahead was my math.
Andrew Tridgell [Thu, 4 Aug 2011 02:07:19 +0000 (12:07 +1000)]
talloc: check block count aftter references test
Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit
73677875b46251f59b66c9713f1decc89bd2ea3e)
The last 7 patches address bug #8384 (Windows XP clients seem to crash smbd
process every once in a while).
Andrew Tridgell [Fri, 29 Jul 2011 01:57:07 +0000 (11:57 +1000)]
talloc: added test suite for talloc_free_children()
this tests the fix from Simo
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Fri Jul 29 11:30:13 CEST 2011 on sn-devel-104
(cherry picked from commit
d004fd0b53fb6f3ae64f0e24cf51f4471d434574)
Jelmer Vernooij [Sun, 24 Apr 2011 00:39:14 +0000 (02:39 +0200)]
Fix license info for talloc in manpage.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Apr 24 03:27:54 CEST 2011 on sn-devel-104
(cherry picked from commit
fb05e82c99f0779bd44371a2bdafdd7147448dd5)
Matthias Dieter Wallnöfer [Thu, 24 Mar 2011 08:41:19 +0000 (09:41 +0100)]
talloc - improve doxygen comment of "talloc_move"
Express better that this should be a pointer of a pointer.
Reviewed-by: Tridge
(cherry picked from commit
6723e90d524c8e73f19c06b3ff28867a1a89b14b)
Matthias Dieter Wallnöfer [Thu, 31 Mar 2011 19:32:51 +0000 (21:32 +0200)]
talloc - some documentation changes
- Fix some typos
- Document better the differences in the behaviour between talloc 1.X and 2.X.
Previously this seemed a bit spongy to me.
Reviewed-by: Jelmer + Tridge
Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Mon Apr 4 11:05:42 CEST 2011 on sn-devel-104
(cherry picked from commit
513574afd759bcb3832374d3ae170f1ed0b0062b)
Simo Sorce [Wed, 27 Jul 2011 16:02:35 +0000 (12:02 -0400)]
talloc: preserve context name on talloc_free_children()
Otherwise tc->name will end up pointing to garbage when it is not
set to a const but rather to a string allocate as child of the context itself.
Signed-off-by: Andrew Tridgell <tridge@samba.org>
(cherry picked from commit
52182a528117c4dd9624f64b34a873c0903ad70a)
Andrew Tridgell [Mon, 8 Aug 2011 08:24:32 +0000 (18:24 +1000)]
talloc: ensure the sibling linked list remains valid during a free
This ensures that the sibling list of a pointer doesn't become invalid
during a free operation. It is an alternative fix to the fix in
6f51a1f45bf4de062cce7a562477e8140630a53d, and avoids the problem of
trying to calculate the parent pointer early
This should fix the subtle spoolss talloc bug that Simo found
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Tue Aug 9 01:53:17 CEST 2011 on sn-devel-104
(cherry picked from commit
cf986f200804ce873b43c1ecf2d5e1bd08eb8a25)
Jeremy Allison [Sat, 20 Aug 2011 18:47:40 +0000 (20:47 +0200)]
s3-vfs: Fix vfs_chown_fsp.
Fix bug #8370 (vfs_chown_fsp broken -- returns in the wrong directory).
Michael Adam [Thu, 11 Aug 2011 08:49:30 +0000 (10:49 +0200)]
s3:build(autoconf): fix bug #8369: remove irritating "." targets when recent system libs exist
Michael Adam [Wed, 10 Aug 2011 11:41:14 +0000 (13:41 +0200)]
s3:idmap_tdb2: fix bug 8368 : correctly initialize "idmap config * : script" with NULL
this fixes the fallback to the deprecated spelling idmap:script
Herb Lewis [Thu, 2 Jun 2011 17:10:39 +0000 (10:10 -0700)]
Fix warning messages on Freebsd 4.6.2.
Signed-off-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit
f0901792324425804592ac7032e3853b4d4c7829)
Fix bug #8365 (backport compiler warnings).
Volker Lendecke [Thu, 11 Aug 2011 14:52:22 +0000 (16:52 +0200)]
s3: Fix bug 8360
OS/2 sends an unexpected write&x/read&x chain
Björn Baumbach [Mon, 16 May 2011 12:25:01 +0000 (14:25 +0200)]
s3-modules: Fix the build of gpfs.c on RHEL 6.0 with gpfs 3.4.0-4
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Wed May 18 11:58:14 CEST 2011 on sn-devel-104
(cherry picked from commit
192198ad70474e56d4708b65482eee976ea78a05)
Fix bug #8364 (gpfs vfs module build broken).
Björn Jacke [Tue, 9 Aug 2011 15:02:29 +0000 (17:02 +0200)]
s3:vfs_prealloc: fix build on SLES8
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Tue Aug 9 19:29:08 CEST 2011 on sn-devel-104
(cherry picked from commit
1e76662ae6aa77d7b6e9e8a0266fcb1a1320a7fb)
Fix bug #8363 (vfs_prealloc build broken on SLES8).
Volker Lendecke [Thu, 19 May 2011 11:43:15 +0000 (13:43 +0200)]
s3: Do central cli_set_error (cherry picked from commit
0645deb1b4a70e45f88116fae16ec7f3a1b4d5ed)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Fix bug #7864 (cli_errstr() usage is wrong).
Volker Lendecke [Fri, 29 Jul 2011 22:25:23 +0000 (15:25 -0700)]
s3: Add a fallback for missing open&x support in OS/X Lion
The last 4 patches address bug #8338 (MAC Lion - smbclient "Open AndX
Request->STATUS_NOT_SUPPORTED).