[SCM] Samba Shared Repository - branch v3-6-stable updated
Karolin Seeger
kseeger at samba.org
Thu Oct 20 11:00:17 MDT 2011
The branch, v3-6-stable has been updated
via 6de842a WHATSNEW: Update changes since 3.6.0.
via b46a8d3 s3/doc: add man page for aio_fork vfs module
via 3e2f400 Fix uninitialized memory problem in group_sids_to_info3 (fixes bug #8455).
via 011ab5f WHATSNEW: Update changes since 3.6.0.
via 011c01d Fix bug #8521 - winbindd cache timeout expiry test was reversed
via 5adf3ba s3: Fix bug 8455 -- Samba PDC is looking up only primary user group
via 7a7feaa Another part of the fix for Bug 8473 - smb2_find uses a hard coded max reply size of 0x10000 instead of smb2_max_trans.
via 7cfd970 s3:smb2_server: get/set info are limited by max_trans size (bug #8473)
via fb3309f s3:smb2_server: reject writes larger then the negotiated max_write size (bug #8473)
via e34912e s3:smb2_server: remember the max_{trans,read,write} sizes we negotiated (bug #8473)
via 9bfd1fe s4:torture/smb2: we only support 64KB reads/writes for now
via 9ee7017 s3:smbd: disconnect the socket if we got an unexpected request
via 8778996 s3:smb2_server: max_trans, max_read and max_write are limited to 64 kilobytes
via 5c204ac WHATSNEW: Update changes since 3.6.0.
via 7877565 Fix bug #8515 - Empty CIFS share can be blocked for other clients by deleting it via empty path (DELETE_PENDING until the last client)
via 5201508 WHATSNEW: Update changes since 3.6.0.
via cafccb0 s3-smb2_server: fix ioctl InputOffset checking
via 3951757 s3-smb2_server: SMB2_OP_IOCTL doesn't require at least 1 dyn byte
via ddd98c1 s3:smb2_server: SMB2_OP_GETINFO doesn't require at least 1 dyn byte
via b00b678 s3:smb2_server: return OBJECT_NAME_INVALID if the path is terminated in SMB2_FIND/QUERY_DIRECTORY
via e4c9011 s3:smb2_server: return OBJECT_NAME_INVALID if the path is terminated in SMB2_CREATE
via e3886d7 s3:smb2_server: return BAD_NETWORK_NAME if the path is terminated in SMB2_TCON
via ef38cf1 s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_write.c
via 08bcf62 s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_setinfo.c
via ee9ee58 s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_read.c
via 1e264b5 s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_notify.c
via e11af3d s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_lock.c
via fa64351 s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_keepalive.c
via c67088c s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_ioctl.c
via de32878 s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_getinfo.c
via 1c233d9 s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_flush.c
via 65d47b2 s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_find.c
via c9a09ca s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_create.c
via 179cc11 s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_close.c
via 5302ee5 s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_break.c
via 987817b s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_tcon.c
via b58c986 s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_sesssetup.c
via 6b16278 s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_negprot.c
via 0bdac68 s3:smb2_server: add smbd_smb2_request_verify_sizes()
via 5666480 s3:smb2_create: fix allocation size return value when opening existing files
via 547fe47 Remove extraneous debug code.
via 8a64e76 Fix bug #8474 - SMB2 create doesn't cope with an Apple client using NULL blob in create
via 569f84e Tidy up previous patch for bug #8442 - NFSv4 DENY ACLs always include SYNCHRONIZE flag - blocking renames.
via 97eaf24 Fix bug #8442 - NFSv4 DENY ACLs always include SYNCHRONIZE flag - blocking renames.
via 8d025d4 s3-docs: Fix typo.
via 0bed956 s3-docs: Fix bug #7908.
via cfe1008 Bug 7551: Return error of cli_push when 'put - /some/file' is used
via bf7cf18 Fix bug #8509 - Read-only handles on SAMR allow SAMR_DOMAIN_ACCESS_CREATE_USER.
via f2df837 Fix bug #8507 - smbd doesn't correctly honor the "force create mode" bits from a cifsfs create.
via 3c141ab Second part of fix for bug #8443 - Default user entry is set to minimal permissions on incoming ACL change with no user specified.
via 4a96c6e First part of fix for bug #8443 - Default user entry is set to minimal permissions on incoming ACL change with no user specified.
via b7264e4 Part 3 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set (Invalid argument)
via bf21859 Part 2 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set (Invalid argument)
via db784d2 Part 1 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set (Invalid argument)
via cdeb2ab Fix bug #8458] - IE9 on Windows 7 cannot download files to samba 3.5.11 share
via 947d887 Fix bug #8493 - DFS breaks zip file extracting unless "follow symlinks = no" set
via 3e412ee s3-docs: Fix typos.
via 29716b9 s3:smb2_server: SMB2_OP_CANCEL requests don't have to be signed
via e0d935d s3-docs: Remove "experimental" label on VFS ACL modules
via 841037a These modules are no longer experimental but production-ready (especially the acl_xattr code). Remove the "experimental" tag.
via 0355375 Fix bug 8480 - acl_xattr can free an invalid pointer if no blob is loaded.
via 13f1ccf s3:smbd: don't call smbd_terminate_connection in smb2_validate_message_id() (bug #8476)
via aaf06d6 Fix bug #8476 - Samba asserts when SMB2 client breaks the crediting rules.
via 71f68e2 s3-libnet: allow to use default krb5 ccache in libnet_Join/libnet_Unjoin.
via 64f6a6e Revert "s3-libnet: allow to use default krb5 ccache in libnet_Join/libnet_Unjoin."
via c6b6993 Fix bug #8473 - smb2_find uses a hard coded max reply size of 0x10000 instead of smb2_max_trans.
via 7df9932 s3-netapi: allow to use default krb5 credential cache for libnetapi users.
via 70d7cc2 s3-libnet: allow to use default krb5 ccache in libnet_Join/libnet_Unjoin.
via df0320c s3-docs: document -k switch in net manpage.
via d1e39ce Fix bug #8477 - Map to guest can return uninitialized blob of data.
via 6e5153f s3-registry: fix bug #8401 - registry/reg_format.c must include includes.h.
via b7955a7 Fix bug #8453 - smbclient segfaults when dialect option -m is used for legacy dialects
via 9c83a77 WHATSNEW: Add changes since 3.6.0.
via 1364621 Fix bug #8229 - git patch attached against 3.6.0-rc2 to fix 'widelinks' regression intro'd in 3.2
via fd6f766 Fix bug 8429 - Compound SMB2 requests on an IPC connection can corrupt the reply stream.
via e63be36 s3-spoolss: Fix bug #8351 forms migration.
via 4359caf s3:libsmb: check the wct of the incoming SMBnegprot responses
via a545f75 s3: Do not fork the echo handler for smb2
via 339b181 s3: Fork the echo handler only after SMB1 negprot is done
via 36107f5 s3-spoolss: Fix bug #8236 empty notify servername.
via 5304362 s3:smb2_server: keep compound_related on struct smbd_smb2_request
via 5202480 Based on metze's fix for Bug 8407 - SMB2 server can return requests out-of-order when processing a compound request.
via 14f6f2c s3:smb2_server: make sure we prefer responses over requests on the client socket
via 6b6c570 Fix bug 8433, segfault in iconv.c
via c7786db s3:smb2 fix Bug 8428 - wrong reply to DHnC (durable handle reconnect)
via 5ebfa35 s3: Fix getent group if trusted domains are not reachable
via a1a9432 Fix bug 8412 - Microsoft Office 2007 (Microsoft Word) fails to save as on a Samba share with SMB2. (cherry picked from commit dec3b21cd1737b317749e7ebced5aa1c2115ebdf) (cherry picked from commit a0a799663bd4780bb9f948e2dd0635dadb4e2c40)
via 7228ed0 s3: Use sys_read in fork_domain_child
via e6b3258 s3: Use sys_write in fork_domain_child
via d114734 s3: Fix a winbind race leading to 100% CPU
via 6c628b8 s3: Fix the build of vfs_aixacl2.c
via e5b3383 s3: Fix bug 8385
via 3261837 Fix bug Bug 8422 - Infinite loop in ACL module code.
via 76eb414 Fix bug #8395 - optimize serverid_exists() for Solaris.
via d70a522 talloc: check block count aftter references test
via 2390eeb talloc: added test suite for talloc_free_children()
via baff9d5 Fix license info for talloc in manpage.
via dfd0961 talloc - improve doxygen comment of "talloc_move"
via 7e5c0ce talloc - some documentation changes
via 84a9b0e talloc: preserve context name on talloc_free_children()
via 5d28670 talloc: ensure the sibling linked list remains valid during a free
via bbbf2e2 s3-vfs: Fix vfs_chown_fsp.
via 51c9fc1 s3:build(autoconf): fix bug #8369: remove irritating "." targets when recent system libs exist (cherry picked from commit c544a744db67c2860065b1c5d70dc14ac0fa19ba)
via a7c0b9c s3:idmap_tdb2: fix bug 8368 : correctly initialize "idmap config * : script" with NULL
via dc49eac Fix warning messages on Freebsd 4.6.2.
via 9b84f52 s3: Fix bug 8360
via 61d0b67 s3-modules: Fix the build of gpfs.c on RHEL 6.0 with gpfs 3.4.0-4
via 20aab03 s3:vfs_prealloc: fix build on SLES8
via 0ac168e s3: Do central cli_set_error (cherry picked from commit 0645deb1b4a70e45f88116fae16ec7f3a1b4d5ed)
via 5ce82dc s3: Add a fallback for missing open&x support in OS/X Lion
via 12245f2 s3: Make map_open_params_to_ntcreate() available in lib/ (cherry picked from commit e7f68cc2a76edd8f7cccdc0445c6b9d61e111f46)
via b617b38 s3: Make is_executable() available in lib/ (cherry picked from commit eb7a5a708ee39f3284983055a39889c98463366f)
via 8acc6b2 s3: We only need base_name in map_open_params_to_ntcreate (cherry picked from commit c9f921156534d38ea2a40d3c5ce8b99d308e5340)
from 0f4a8b5 WHATSNEW: Correct default value of smb2 max credits.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-stable
- Log -----------------------------------------------------------------
commit 6de842a36dc62db3587a49871cd59d87d54565c6
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Oct 18 20:45:34 2011 +0200
WHATSNEW: Update changes since 3.6.0.
Karolin
(cherry picked from commit 06e007da09f5162dc2fea60e2c799b516ce475e2)
commit b46a8d359d1afb228d0b3c311c69871fcd263040
Author: Björn Jacke <bj at sernet.de>
Date: Tue Oct 18 10:54:56 2011 +0200
s3/doc: add man page for aio_fork vfs module
thanks to Volker for the content
Autobuild-User: Björn Jacke <bj at sernet.de>
Autobuild-Date: Tue Oct 18 12:24:35 CEST 2011 on sn-devel-104
(cherry picked from commit 56328a4d61c8d0a52f6841097bf8fc4ffd46bfb6)
(cherry picked from commit 51f87fce55d160abed6b04ea27f53f254d2db474)
commit 3e2f4007a084a71c2bc3a9b73bea5f0c4cbd35cf
Author: Wilco Baan Hofman <wilco at baanhofman.nl>
Date: Mon Oct 17 21:24:41 2011 +0200
Fix uninitialized memory problem in group_sids_to_info3 (fixes bug #8455).
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Mon Oct 17 23:32:58 CEST 2011 on sn-devel-104
(cherry picked from commit c52b571506874987ba626c25e9692fbe2251b7e2)
(cherry picked from commit 31c00e9314e735505590f98565dcb5aa58453d0e)
commit 011ab5f98048a5269a234e8582b3d1bf41feccb7
Author: Karolin Seeger <kseeger at samba.org>
Date: Sat Oct 15 20:46:34 2011 +0200
WHATSNEW: Update changes since 3.6.0.
Karolin
(cherry picked from commit 47f1e507155cb601217e7263ff1d34774063eea3)
commit 011c01d4abc71220b3e72dcc61e5a41c94084ae4
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 12 09:43:18 2011 -0700
Fix bug #8521 - winbindd cache timeout expiry test was reversed
Found and fix reported by Micha Lenk <micha at lenk.info>. Thanks !
(cherry picked from commit 1e4761d05978b7a495d121acc1deaa7049f3911c)
(cherry picked from commit 78c8a1f74042738d6028636902cdb575a4359443)
commit 5adf3baf87fb7d2848fffc9b7231808e46fc74c4
Author: Volker Lendecke <vl at samba.org>
Date: Fri Sep 16 15:45:47 2011 +0200
s3: Fix bug 8455 -- Samba PDC is looking up only primary user group
group_sids_to_info3 does a sid_peek_check_rid on the domain sid before adding
the rids to the array. If the domain sid is 0x0, then the check will always
fail.
Autobuild-User: Volker Lendecke <vlendec at samba.org>
Autobuild-Date: Sat Sep 17 00:51:27 CEST 2011 on sn-devel-104
(cherry picked from commit 3dcec44f3edbc9c4f1946ead3480f6d01cd53e7a)
(cherry picked from commit 095a8c2c42c8af5563bb7e0657bf2c2806d5da25)
commit 7a7feaae8ce94626f0e185c177fc2e9ef88d8523
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 12 14:00:32 2011 -0700
Another part of the fix for Bug 8473 - smb2_find uses a hard coded max reply size of 0x10000 instead of smb2_max_trans.
Change the defaults and the documentation to reflect the 64k limit.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Thu Oct 13 12:22:23 CEST 2011 on sn-devel-104
(cherry picked from commit d2a9e8df35be1516f22f0ef78356de6d4b02d4d3)
(cherry picked from commit a97cbf014efed5c85447d6478d4fc6803828bc8b)
commit 7cfd970602378548944aa1a730430a49965cfa14
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Oct 12 17:46:50 2011 +0200
s3:smb2_server: get/set info are limited by max_trans size (bug #8473)
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Thu Oct 13 03:32:02 CEST 2011 on sn-devel-104
(cherry picked from commit 5e04231e961f10656384a6f16104d0d55b6f3e0e)
(cherry picked from commit 76ee6a961e4d0e32f425ecec6fe3f7633c96e584)
commit fb3309f313381028b201c105a7c1804f9fa55b1d
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Oct 12 16:58:46 2011 +0200
s3:smb2_server: reject writes larger then the negotiated max_write size (bug #8473)
metze
(cherry picked from commit 6981f1114792cc251bf1e05183dd88f5d351ab09)
(cherry picked from commit 8453b6b274b94d151229014ac3feb0d67a7e4513)
commit e34912e06f53dd8844b5ccde8f20ad962c52cc0f
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Sep 23 17:18:14 2011 +0200
s3:smb2_server: remember the max_{trans,read,write} sizes we negotiated (bug #8473)
We should enforce the negotiated max sizes instead of the
lp_smb2_max_*() sizes.
metze
(cherry picked from commit 40ea66c5dda91ba3f74bed7db1ce02f6c8b4ffeb)
(cherry picked from commit 9c0650a066812dd6306463738c3d5a3823938c2c)
commit 9bfd1fe1f445f8e167a38f8ff3f9c039d729f78b
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Oct 12 18:34:26 2011 +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)
(cherry picked from commit 69be2b1cd34cec481c252883a6713c1ed672a7f8)
commit 9ee7017a3abb868f9bd15b79ebb9e1654780d131
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Sep 23 06:37:35 2011 +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 at samba.org>
Autobuild-Date: Fri Sep 23 12:30:50 CEST 2011 on sn-devel-104
(cherry picked from commit 5494856294384df4360d85e68abc03c43dc16e06)
(cherry picked from commit 8d54841f640212a5c3d026df3fbfd1f7c99ac7f7)
commit 8778996e1bbc01672f68a0c5b01d34f86002b8a1
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Sep 5 12:14:06 2011 +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)
(cherry picked from commit 84b4cd03a17e84ffd311b99ec73846a29507418d)
commit 5c204ac5cd53f70a255628779fd55c195dbe3c3d
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Oct 12 21:56:27 2011 +0200
WHATSNEW: Update changes since 3.6.0.
Karolin
(cherry picked from commit 60b85eada6e1289b76865e6b4797f2fe0134cfaa)
commit 7877565b4d62dbd89ccdc6948a519954e8e4e52d
Author: Volodymyr Khomenko <Volodymyr_Khomenko at dell.com>
Date: Wed Oct 12 09:57:57 2011 -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 at samba.org>
Autobuild-Date: Wed Oct 12 21:07:27 CEST 2011 on sn-devel-104
(cherry picked from commit bd260f03ab492d03c2890db47dc6fb4f1b824a1a)
(cherry picked from commit 0953c4b9ebc06518920b9d49de16dfaeb7d69a35)
commit 52015088500dd9d586df2dc5c0108d7a1d9436de
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Oct 12 21:44:52 2011 +0200
WHATSNEW: Update changes since 3.6.0.
Karolin
(cherry picked from commit 810c0a8c32b1031aedae49e7a4d971e04c83f0eb)
commit cafccb0b10d69ae30fedd0a201570c3568168f3c
Author: David Disseldorp <ddiss at suse.de>
Date: Wed Sep 28 14:45:42 2011 +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 at 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).
(cherry picked from commit 18d7c0cd25b1fe09a361a332a9191c92bb5a315e)
commit 3951757228f8ea4bc78a4a625f304b17ae65ed51
Author: David Disseldorp <ddiss at suse.de>
Date: Sun Sep 25 23:39:07 2011 +0200
s3-smb2_server: SMB2_OP_IOCTL doesn't require at least 1 dyn byte
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 18482957daa2e2122ef39426a8fff167df3c9377)
(cherry picked from commit e68fae451f4e1feb48484d0e28ed5fad1df7ca55)
commit ddd98c187c4d89b38bafe7cd7157d47e7c45bf28
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Sep 14 13:04:28 2011 +0200
s3:smb2_server: SMB2_OP_GETINFO doesn't require at least 1 dyn byte
metze
(cherry picked from commit 563fa741f6a34a1300c81a8474ca87346a9f5cca)
(cherry picked from commit 349a7a5005609fadbec71d7a033b95757f23a59a)
commit b00b678169103aa7ba550190a8ac884f39201c5a
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:14:52 2011 +0200
s3:smb2_server: return OBJECT_NAME_INVALID if the path is terminated in SMB2_FIND/QUERY_DIRECTORY
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Wed Sep 7 12:15:51 CEST 2011 on sn-devel-104
(cherry picked from commit 9bc4decc1cba701926fc8081c3903aac754a6f51)
(cherry picked from commit fdb15df44a5ee4101b9e0c9bcdd07e48f6ce24fc)
commit e4c90118ea3856bda536355e73c95a1684206b76
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:14:52 2011 +0200
s3:smb2_server: return OBJECT_NAME_INVALID if the path is terminated in SMB2_CREATE
metze
(cherry picked from commit 1bc93c2605e14104237bb100db1d8acb1e7fe389)
(cherry picked from commit 52d0bde69a67c1a3a6798b496eec75ca1d3259f2)
commit e3886d743792a8727945922801d8a1b571efc27a
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:14:52 2011 +0200
s3:smb2_server: return BAD_NETWORK_NAME if the path is terminated in SMB2_TCON
metze
(cherry picked from commit 68b33aa61ac393c2737969f8449adce3e3096d73)
(cherry picked from commit fb1c61880c962f26a28a45ffc9c8680edad65488)
commit ef38cf1d4b04cb71d7a36d843ca7af8d4e6de1f0
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_write.c
metze
(cherry picked from commit 1a726b88ec74962d0317740bbdf576ddcffb52bc)
(cherry picked from commit 10e5d1c6361fb309de0b2dd291deefb69c6506e6)
commit 08bcf626afa38bd783ce3789a2c89749dd98c651
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_setinfo.c
metze
(cherry picked from commit 3643a05ba63ac5d8466dc8391b5d05efeedb5ac4)
(cherry picked from commit 56b765a8663f59d247f970af8273ba749f094cae)
commit ee9ee58076acb98d449712f239888038bfb99bc1
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_read.c
metze
(cherry picked from commit f3a8d65bdfe496f080a74eb7104500bd8e2b0179)
(cherry picked from commit ecfbe10edab6bd1a6a30cc4e1a19f3289d58455c)
commit 1e264b535beb0fa063c09c74b835ffdf46fe9159
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_notify.c
metze
(cherry picked from commit c6480366e551d1dc683c2648bd897bdc7c1b90df)
(cherry picked from commit c9e510cd3d509999d6a6ed813c2a4ebff7b5456c)
commit e11af3d8cc6907eab68fa216e710418c72ff1ae4
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_lock.c
metze
(cherry picked from commit a358eee2d8670d4a1675e82562fa704fa45a71e6)
(cherry picked from commit 12869c065fe164e02425ef44f4879b11ea0e7baf)
commit fa64351859c6b8dc7485b2bcbc4987556fa9af4b
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_keepalive.c
metze
(cherry picked from commit 22d479f75794b7c5fcac2fd47fbfd767700507d6)
(cherry picked from commit 0d217c5f9c725926b6a58373af59e8bca3dd6edc)
commit c67088c5fdcc2dd4eaa7d5317f73546eb13d5f2a
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_ioctl.c
metze
(cherry picked from commit 29b3601c028b8861102b1d988285c78fc17f3b8e)
(cherry picked from commit 73aa7eee9af008a5dad96d658c4d3d5b5148cce6)
commit de32878c167935336b33c567dba1b11dcbce038d
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_getinfo.c
metze
(cherry picked from commit 880eafd7e83ba326be7036605179e8de746f4312)
(cherry picked from commit f45348edea0b2ee8b397e7236dc7786cbce96c19)
commit 1c233d986053b25ecaeef913d54504d56a396319
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_flush.c
metze
(cherry picked from commit 440f702aa9a020f8cfe13037b7af1ba0dadf86f2)
(cherry picked from commit 2bd03ad79a4afcb419513185defdeb7aff69427b)
commit 65d47b26e4073717732b5c853f7f72309a8a5fa2
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_find.c
metze
(cherry picked from commit bc95ab99dc84fa6d567a7d4e803552363bbc07a9)
(cherry picked from commit 5ec26db056b7bb86be4a09f1999fadc383001d57)
commit c9a09ca982f4fc079a027cf62ad61c3c83adec53
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_create.c
metze
(cherry picked from commit 251815bfd395398857cb60c0b89710ddce7ab19f)
(cherry picked from commit 4e4817930955228923f04540404786ff88ad14f8)
commit 179cc11a48d86f4cf8752dd8163721ca4b168b4b
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_close.c
metze
(cherry picked from commit e09b3940a769806dcc17d24079375f5d53eca26a)
(cherry picked from commit 27f3f2617a5de7797458b6d39ddf7ab6212d0949)
commit 5302ee5b80bca9098e4b3314829adfa9fcd0a966
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_break.c
metze
(cherry picked from commit 9da2f72d471460d9c953e9cee84c9cfa3611e89e)
(cherry picked from commit b4190c336dc344f96c4bb837da1e7e923abffca5)
commit 987817b093069baa3493c29d2fd3f9ca0ff23cb2
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_tcon.c
metze
(cherry picked from commit 02f7c37e671c7950619c000b73c5a09ce31c68ac)
(cherry picked from commit 32e0306924ade89c67970c6714bd2033056b3792)
commit b58c986377a9b1d721fa73cb976d8e6f721512f4
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_sesssetup.c
metze
(cherry picked from commit d280d9f945be2d658694c6d4503822e99dc953b5)
(cherry picked from commit fd01ec18dc84b4d632bf9384705d72f2a970cf65)
commit 6b1627866ff294946adb720cbf7e9faab79192cc
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Sep 6 14:01:43 2011 +0200
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_negprot.c
metze
(cherry picked from commit 7ec3a35d2a67ca93a49094f07a12b0e37cec1661)
(cherry picked from commit f32047b23d6e16e4cc75ae0b3beaf7b34307703c)
commit 0bdac68c621872a942c3dcc95c85ec9e13a81a3a
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Oct 3 14:50:48 2011 -0700
s3:smb2_server: add smbd_smb2_request_verify_sizes()
metze.
(cherry picked from commit fd6abe0c92cb22d26615ea443e0ede288ab37a6e)
commit 56664800e1858f6a7156a4f611dd6d02873892ff
Author: Christian Ambach <ambi at samba.org>
Date: Mon Oct 10 17:48:18 2011 +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 at 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).
(cherry picked from commit 762811de03b719ae9b69ac4e7b94a3db224c1ab9)
commit 547fe474472feed43226c3d05219d93918631b59
Author: Jeremy Allison <jra at samba.org>
Date: Wed Sep 21 13:47:22 2011 -0700
Remove extraneous debug code.
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Thu Sep 22 00:22:12 CEST 2011 on sn-devel-104
(cherry picked from commit df6a64bb0bc181c76d1e3c05e19414dd9e9709f5)
commit 8a64e764bb3c79d53d4f8bd22d48e483c2f49253
Author: Jeremy Allison <jra at samba.org>
Date: Wed Sep 21 11:40:01 2011 -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 at samba.org>
Autobuild-Date: Wed Sep 21 22:12:40 CEST 2011 on sn-devel-104
(cherry picked from commit 2a9792f4d9963e4b4cbd38da47d8296694333269)
commit 569f84eedc9bbd22ccae6230a4d7000b265d4852
Author: Jeremy Allison <jra at samba.org>
Date: Wed Sep 7 14:57:11 2011 -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 at samba.org>
Autobuild-Date: Thu Sep 8 03:34:39 CEST 2011 on sn-devel-104
(cherry picked from commit 0aa6751e919d842cdae044be26f6da725063eac2)
(cherry picked from commit 46798c8dea820ae91e7ed48f2a673d321b4676bc)
commit 97eaf243acb8e87ed989e645cada7db36f619ee7
Author: Ira Cooper <ira at wakeful.net>
Date: Wed Sep 7 12:24:22 2011 -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 at samba.org>
Autobuild-Date: Wed Sep 7 22:56:06 CEST 2011 on sn-devel-104
(cherry picked from commit 600451da33728cbd377b122c85cf146f5b319998)
(cherry picked from commit 8678e2158064e075ed276a2a4f1ac552903af414)
commit 8d025d4304a91f942b3a8095616a823f5f1b92ea
Author: Karolin Seeger <kseeger at samba.org>
Date: Sat Oct 8 20:54:37 2011 +0200
s3-docs: Fix typo.
Karolin
Autobuild-User: Karolin Seeger <kseeger at samba.org>
Autobuild-Date: Sat Oct 8 22:27:07 CEST 2011 on sn-devel-104
(cherry picked from commit 851d6625d5e08ac9659a6d23d105f9e0c47f9692)
(cherry picked from commit 495d164e8f3ac7d3064c48fe785f8d443f2f63ad)
commit 0bed956cd319cb0d477502df8c6dbdbc70a6273a
Author: Karolin Seeger <kseeger at samba.org>
Date: Sat Oct 8 20:53:18 2011 +0200
s3-docs: Fix bug #7908.
Fix typo.
Thanks to John Bradshaw for reporting!
Karolin
(cherry picked from commit 8aaa27754663a55f45facc18783eea458205d8a5)
(cherry picked from commit 0ccce6e5a212859849c77f8a5e02790b8f17deaa)
commit cfe1008c4ebcd60174f984f02c52db6c68161364
Author: Bram <fnzon at lists.wizbit.be>
Date: Thu Sep 29 11:28:03 2011 +0200
Bug 7551: Return error of cli_push when 'put - /some/file' is used
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Thu Sep 29 23:47:02 CEST 2011 on sn-devel-104
(cherry picked from commit d883cc664cac81633a60e5b04f99f23a3577ae65)
(cherry picked from commit 04d31e65ee5e6552e806b342eb32af264661a7bc)
commit bf7cf189a5c310b5c21b27e887ddd9282397c553
Author: Jeremy Allison <jra at samba.org>
Date: Fri Oct 7 11:09:44 2011 -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 at samba.org> for finding and testing this.
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Fri Oct 7 21:51:27 CEST 2011 on sn-devel-104
(cherry picked from commit c80ba57169cee2ec66e8afe3616956c17958a3ae)
(cherry picked from commit 928523b7878757e11bdec1cb89fa7b3e7e12f115)
commit f2df8379179445d92fc9b7bc03d27b9c871c312a
Author: Jeremy Allison <jra at samba.org>
Date: Tue Oct 4 14:46:00 2011 -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 at samba.org>
Autobuild-Date: Wed Oct 5 01:19:17 CEST 2011 on sn-devel-104
(cherry picked from commit f93fd128eb623e324459806a34052bd40afe82e5)
(cherry picked from commit 5253d36689115672f35ea8fffdcf509587900135)
commit 3c141abd300eb759f68e0e1ae106ee6f34e2775a
Author: Jeremy Allison <jra at samba.org>
Date: Thu Sep 8 13:48:27 2011 -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 at samba.org>
Autobuild-Date: Fri Sep 9 00:26:08 CEST 2011 on sn-devel-104
(cherry picked from commit e30b8c72def13e2abc14858ea64eb849ea665b80)
(cherry picked from commit 589bea9d314e14b8a493acdb31104f731073cafa)
commit 4a96c6e69a46304c302ce572d074c2af6310c21a
Author: Jeremy Allison <jra at samba.org>
Date: Thu Sep 8 12:51:18 2011 -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)
(cherry picked from commit 0bb1e5919a5f3dd3a290f7dd082b3e67c95b37c6)
commit b7264e4efe723243e5593ae016020baad2e7ecf7
Author: Jeremy Allison <jra at samba.org>
Date: Fri Sep 2 12:22:34 2011 -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)
(cherry picked from commit 5e06c88de7bc4fe215c8630d9c3b6861f18d63bf)
commit bf21859b02f300fd2fe91d093ccce8dc18a53390
Author: Jeremy Allison <jra at samba.org>
Date: Fri Sep 2 11:58:56 2011 -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)
(cherry picked from commit 7f3a6c5631f901240d9e460b16d1df81e6f66e2d)
commit db784d20291def6986a0d61d16949e28d925ffe6
Author: Jeremy Allison <jra at samba.org>
Date: Fri Sep 2 11:21:08 2011 -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)
(cherry picked from commit 27c49f085a16da709e64e0f50df535edcb524b77)
commit cdeb2ab16d4b932703bce8600119bcf08d21e596
Author: Jeremy Allison <jra at samba.org>
Date: Wed Sep 21 13:33:38 2011 -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)
(cherry picked from commit 5f4eb867b1297493473b0d652c7e3d0d21260bf8)
commit 947d88736d721784855e8a890c34448768b84136
Author: Jeremy Allison <jra at samba.org>
Date: Fri Sep 30 13:35:59 2011 -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 at samba.org>
Autobuild-Date: Sat Oct 1 00:45:59 CEST 2011 on sn-devel-104
(cherry picked from commit 149875f887287dbbf016d2252962b023b0bae967)
commit 3e412eec10db1a1935eecc24743d90d068dec5eb
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jun 6 19:58:22 2011 +0200
s3-docs: Fix typos.
Thanks to Samba-JP oota <ribbon at samba.gr.jp> for reporting!
Karolin
Autobuild-User: Karolin Seeger <kseeger at samba.org>
Autobuild-Date: Fri Sep 30 23:12:35 CEST 2011 on sn-devel-104
(cherry picked from commit 5c569a97ab477a324a96aae7f58770ccbe2572de)
(cherry picked from commit e6b33a5a3f83272d7e6dea66b1f15db4b19d3170)
commit 29716b9dec1819cc85c5a800881602597ded9baa
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Sep 28 08:28:08 2011 +0200
s3:smb2_server: SMB2_OP_CANCEL requests don't have to be signed
metze
Autobuild-User: Stefan Metzmacher <metze at 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).
(cherry picked from commit 3d2c591ff6ce75317556de8ad522c73e5cc8f614)
commit e0d935dadd4c34ef07f5e431fe954d0c6d310ee0
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Sep 28 20:17:42 2011 +0200
s3-docs: Remove "experimental" label on VFS ACL modules
in the documentation also (bug #8494).
Karolin
(cherry picked from commit bd5d9d9fba23ea585b701c41ec27482a0076729e)
commit 841037a527b47e3adfb8fbd48304a51f36cfbeb8
Author: Jeremy Allison <jra at samba.org>
Date: Tue Sep 27 10:23:08 2011 -0700
These modules are no longer experimental but production-ready (especially the acl_xattr code). Remove the "experimental" tag.
Autobuild-User: Jeremy Allison <jra at 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).
(cherry picked from commit bdf1c399646a0a968a4360c65be2db8089e6ab8d)
commit 0355375c0e2d06b290e64b518662fa5d012c5136
Author: David Disseldorp <ddiss at suse.de>
Date: Fri Sep 23 11:46:06 2011 -0700
Fix bug 8480 - acl_xattr can free an invalid pointer if no blob is loaded.
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Fri Sep 23 22:20:55 CEST 2011 on sn-devel-104
(cherry picked from commit ca8c25abebb8715176f68be9916217db9a8400dd)
(cherry picked from commit 700532c72592751b57521295b80f65039a260471)
commit 13f1ccfee5dac7fd4c89702f1368dd670c6af886
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Sep 23 06:08:51 2011 +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.)
(cherry picked from commit bdb2c72565e1374585bd638d2d12862d90b80c6b)
commit aaf06d68d4fc475c9c27538e1ad0f81622140357
Author: Jeremy Allison <jra at samba.org>
Date: Thu Sep 22 09:06:48 2011 -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 at samba.org>
Autobuild-Date: Thu Sep 22 19:41:31 CEST 2011 on sn-devel-104
(cherry picked from commit d50fa9c21e1c3b6f7126c33e24966099c7567225)
(cherry picked from commit 46ead7f8b1ee69cb61abdc1358ed2c4c411e3fc1)
commit 71f68e283ce580a2e19e4c5e2aed0c531719a056
Author: Günther Deschner <gd at samba.org>
Date: Wed Sep 21 17:28:58 2011 +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).
(cherry picked from commit 65d953f074394c0a588f1741aeb6c79f1a515866)
commit 64f6a6e091ebab38d4a1828b8e1a27c9cc2a6fa8
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Sep 26 21:10:46 2011 +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.
(cherry picked from commit 82e2f1834380c226eed203a70eaec21b73c0d10a)
commit c6b69933848019ccab935825c9701aec039b49c4
Author: Jeremy Allison <jra at samba.org>
Date: Wed Sep 21 11:30:06 2011 -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)
(cherry picked from commit 92a6ffc4a9fa37f5e05987835f15c37211fa810f)
commit 7df9932ac8c7355603d3e34b3e7f6cf16ec94af3
Author: Günther Deschner <gd at samba.org>
Date: Mon Sep 26 16:25:12 2011 +0200
s3-netapi: allow to use default krb5 credential cache for libnetapi users.
Guenther
(cherry picked from commit 1f9875f435d1a9cf6d0476f476f8af9480b87bdb)
commit 70d7cc271ff333003806cfc4cae95518e2fb9f75
Author: Günther Deschner <gd at samba.org>
Date: Wed Sep 21 17:28:58 2011 +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
(cherry picked from commit 050123d9b6ae8fd69ed58380d8bdf210c38556fc)
commit df0320ce7761b9426b8b4d8469cd2ebb02640f1b
Author: Günther Deschner <gd at samba.org>
Date: Tue Sep 20 14:13:36 2011 +0200
s3-docs: document -k switch in net manpage.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Tue Sep 20 15:47:00 CEST 2011 on sn-devel-104
(cherry picked from commit 8dda773bd7eea1d163282b1f3c5e90cbff8a1003)
(cherry picked from commit d7a691e2d713aa37b13d88bab628f9b45f05d10d)
commit d1e39ce1268d272374320e4e24439d62bee69cb3
Author: Jeremy Allison <jra at samba.org>
Date: Thu Sep 22 13:42:56 2011 -0700
Fix bug #8477 - Map to guest can return uninitialized blob of data.
Found by Codenomicon at SNIA SDC.
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Fri Sep 23 03:19:46 CEST 2011 on sn-devel-104
(cherry picked from commit f0f91d0117b2ccf778382e61a411b5e4f0ea2b14)
(cherry picked from commit b60b85c55295b1e7ba41a5e835345af28cdd3592)
commit 6e5153f7e618d23fe986a3b4afd64a8454509b92
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 25 13:39:25 2011 +0200
s3-registry: fix bug #8401 - registry/reg_format.c must include includes.h.
Guenther
(cherry picked from commit e00a6c40bf13d9c1225022129e4cb1d617aa49bf)
(cherry picked from commit c0156d6a4059f42e6fefaec5ddbec92129d5a180)
commit b7955a7deda68036de2714921fbe169ae1eaae59
Author: Jeremy Allison <jra at samba.org>
Date: Wed Sep 14 11:55:16 2011 -0700
Fix bug #8453 - smbclient segfaults when dialect option -m is used for legacy dialects
Ensure we have valid pointers.
(cherry picked from commit 9bbb3a89ffa39c9be30c269bf96f080866740406)
commit 9c83a776233a0e8b0f7927446256e097a71fdf0d
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Sep 16 21:37:10 2011 +0200
WHATSNEW: Add changes since 3.6.0.
To be completed.
Karolin
(cherry picked from commit 5a109e34dc93e338dc18b5e1dc1881d5b8fdc093)
commit 1364621b0cf6670149f67b8a84a5f615aa4756a0
Author: Jeremy Allison <jra at samba.org>
Date: Tue Sep 13 17:03:46 2011 -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 at tlinx.org>
(cherry picked from commit 8fcba00fc3329f5a4bda63a3c3beac30d07a0463)
commit fd6f7666ef4bf005f8b6c20c664a77db0244ff2b
Author: Jeremy Allison <jra at samba.org>
Date: Tue Aug 30 17:37:19 2011 -0700
Fix bug 8429 - Compound SMB2 requests on an IPC connection can corrupt the reply stream.
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Wed Aug 31 21:18:11 CEST 2011 on sn-devel-104
(cherry picked from commit 786fe9fab223723e4d2340f285592b2a44945d73)
(cherry picked from commit 740c7bd0fead31517890548a02f881b7310cc537)
commit e63be362c3ece75f4934da68b7a34000bfa0342e
Author: Andreas Schneider <asn at samba.org>
Date: Tue Sep 6 14:09:47 2011 +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 at samba.org>
(cherry picked from commit a272dcf1754bd31ab585bf5b40b5b7f59be27467)
commit 4359caffb95cb715338e2fe628f0aa1fcd81e1a8
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Sep 12 12:06:53 2011 -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.
(cherry picked from commit 1168f7799fb3a1de96233080cd11c6114584b329)
commit a545f7540f58cf277cf2ba97254908f827803462
Author: Volker Lendecke <vl at samba.org>
Date: Wed Aug 31 15:06:35 2011 +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).
(cherry picked from commit d72878365e3ab0ef7bc31065261d744d7693d578)
commit 339b1819bf232b440ce91147bbb6821cf8f200c6
Author: Volker Lendecke <vl at samba.org>
Date: Fri May 20 13:07:17 2011 +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 at samba.org>
Autobuild-Date: Fri May 20 15:06:03 CEST 2011 on sn-devel-104
(cherry picked from commit 4ad4665e10a77038d7f3dd8400473c8fcf3db451)
commit 36107f5671c2ba3c81c07f09239341f467f874ae
Author: Andreas Schneider <asn at samba.org>
Date: Fri Sep 2 17:03:43 2011 +0200
s3-spoolss: Fix bug #8236 empty notify servername.
Signed-off-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 703b787307984b5ddf1ef0b214092288d7b076fc)
commit 5304362628beb9a30eb2dc12bee41f785a41b5cf
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Aug 25 23:33:41 2011 +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).
(cherry picked from commit 151bea2cc30f5a3e3cfaafd9e080f0d510f9563e)
commit 52024802819896b1238e6316845f4c3a4c843e8f
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 26 14:23:26 2011 -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)
(cherry picked from commit bd377e89a6bc5fa20485bf9614c06159c9785cdf)
commit 14f6f2c5f26e3ee1a2e9486a5b2de601290f3215
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Aug 5 20:34:43 2011 +0200
s3:smb2_server: make sure we prefer responses over requests on the client socket
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Fri Aug 12 16:46:43 CEST 2011 on sn-devel-104
(cherry picked from commit 42cde0480bd6a5e2dddaa66917e1fa71e6a4edcd)
(cherry picked from commit 90e4b68a3b0e46c238753e66ededa16de3104302)
commit 6b6c570b3eabd9df82c91a47ce874b310d76fd0d
Author: Volker Lendecke <vl at samba.org>
Date: Thu Sep 1 16:55:03 2011 +0200
Fix bug 8433, segfault in iconv.c
Autobuild-User: Volker Lendecke <vlendec at samba.org>
Autobuild-Date: Thu Sep 1 18:25:34 CEST 2011 on sn-devel-104
(cherry picked from commit 1d4de78f567e908e0acc218630fceb0884b07d65)
(cherry picked from commit 7d2006ccf58555e82bc957aa62beab6420fcbc48)
commit c7786db673e9e5a478518f9c44341c428a92762e
Author: Christian Ambach <ambi at samba.org>
Date: Tue Aug 30 17:39:56 2011 +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!
(cherry picked from commit fc8c5880d9785103e3345781bfca48e67a92cc33)
commit 5ebfa3590e98401ada06c00854029df35cd49be2
Author: Volker Lendecke <vl at samba.org>
Date: Thu Aug 25 20:13:09 2011 +0200
s3: Fix getent group if trusted domains are not reachable
Fix bug #8420 (wb_group_members: non-resistance against garbage).
(cherry picked from commit 1a996fe1d12a55e68b7266ce5db8972b6e5f101a)
commit a1a9432c9903264480be6ccc1d5e30fe45b58392
Author: Jeremy Allison <jra at samba.org>
Date: Mon Aug 29 16:47:16 2011 -0700
Fix bug 8412 - Microsoft Office 2007 (Microsoft Word) fails to save as on a Samba share with SMB2. (cherry picked from commit dec3b21cd1737b317749e7ebced5aa1c2115ebdf)
(cherry picked from commit a0a799663bd4780bb9f948e2dd0635dadb4e2c40)
commit 7228ed0429d39d1cd153a1c29d38cd0f9532e623
Author: Volker Lendecke <vl at samba.org>
Date: Fri Aug 26 11:38:21 2011 +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).
(cherry picked from commit 2f0a5b477f58378c3505631d15b422057b037efe)
commit e6b3258e3b2691140425175d41cc73c6e0647b1f
Author: Volker Lendecke <vl at samba.org>
Date: Fri Aug 26 11:39:41 2011 +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 at samba.org>
Autobuild-Date: Fri Aug 26 13:14:27 CEST 2011 on sn-devel-104
(cherry picked from commit e0e3d215b1902ecbeb3d469af9a196856711921e)
(cherry picked from commit 11ab2d68023dbfd9089a7e2ec2d36ef4f1f7974e)
commit d11473401c89b810473f191c4c2febb048912a1d
Author: Volker Lendecke <vl at samba.org>
Date: Fri Aug 26 16:54:18 2011 +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 at samba.org>
Autobuild-Date: Fri Aug 26 18:51:24 CEST 2011 on sn-devel-104
(cherry picked from commit ed058f4dc3e059967f3c0538bc220866e9c63588)
(cherry picked from commit b181fe9ec50ff63074b217143b6daa5cddfb8853)
commit 6c628b8b1488a9ddce37787fce3ac4a4b1d39431
Author: SATOH Fumiyasu <fumiyas at osstech.co.jp>
Date: Mon Aug 22 13:48:40 2011 +0900
s3: Fix the build of vfs_aixacl2.c
Autobuild-User: Volker Lendecke <vlendec at 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).
(cherry picked from commit e66a1f06dc0cdbebf6a4adb801317773a09f0dbc)
commit e5b338313be19767e4ca085bcd345b392c759ff1
Author: Volker Lendecke <vl at samba.org>
Date: Mon Aug 22 14:16:26 2011 +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 at samba.org>
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Thu Aug 25 19:39:12 CEST 2011 on sn-devel-104
(cherry picked from commit 50e30afa608dfdeae8a260730ead9761ed424dad)
(cherry picked from commit 45392d05ff059987fb76d3818969177b5a5de6b0)
commit 32618377c50405e7b0dabf9b39f4e7a7c885b6b7
Author: Jeremy Allison <jra at samba.org>
Date: Mon Aug 29 16:46:15 2011 -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)
(cherry picked from commit 225c66ada497449a55d2eed6dfb27cedf3a863c0)
commit 76eb41461c670c23838e27e3cc7b7d6d4fd661a4
Author: Ira Cooper <ira at wakeful.net>
Date: Mon Aug 22 12:46:41 2011 -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.
(cherry picked from commit 9bf2b3034b4c9523bfac779e518a2a1a6d76ef46)
commit d70a522a02abc90a6773ad32a4fa5baeedc89d11
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Aug 4 12:07:19 2011 +1000
talloc: check block count aftter references test
Pair-Programmed-With: Amitay Isaacs <amitay at 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).
(cherry picked from commit 8d46b29595c4da27b175b25a08b945fbeeeab3ec)
commit 2390eeb518f7cf16b3f9bf715e53146aae2461d4
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Jul 29 11:57:07 2011 +1000
talloc: added test suite for talloc_free_children()
this tests the fix from Simo
Autobuild-User: Andrew Tridgell <tridge at samba.org>
Autobuild-Date: Fri Jul 29 11:30:13 CEST 2011 on sn-devel-104
(cherry picked from commit d004fd0b53fb6f3ae64f0e24cf51f4471d434574)
(cherry picked from commit 2e07c662b08f8bba5cc03efcdcc13165e392b6e8)
commit baff9d509f4f3a50ef7b1c22989e3b2d6788ca7b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Apr 24 02:39:14 2011 +0200
Fix license info for talloc in manpage.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Sun Apr 24 03:27:54 CEST 2011 on sn-devel-104
(cherry picked from commit fb05e82c99f0779bd44371a2bdafdd7147448dd5)
(cherry picked from commit 39b7c96517995d2b14e19a006cb18ef642cb98ff)
commit dfd0961f4b97f5cdf9ff3a3b8f1c4ce624df09da
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Thu Mar 24 09:41:19 2011 +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)
(cherry picked from commit 0c5a41da1375bab225274833ba149ba47df42aec)
commit 7e5c0cedb1ec4d5529777745ee7ced2e928d9dfc
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Thu Mar 31 21:32:51 2011 +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 at samba.org>
Autobuild-Date: Mon Apr 4 11:05:42 CEST 2011 on sn-devel-104
(cherry picked from commit 513574afd759bcb3832374d3ae170f1ed0b0062b)
(cherry picked from commit db9670dd163432d6758a81c5aa6000c13e61b14a)
commit 84a9b0e3dfbf7f088c7b236b045e8957fbebde76
Author: Simo Sorce <idra at samba.org>
Date: Wed Jul 27 12:02:35 2011 -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 at samba.org>
(cherry picked from commit 52182a528117c4dd9624f64b34a873c0903ad70a)
(cherry picked from commit 99495ea4d28de530fedc11c94d36bc304cf9ae4a)
commit 5d28670d574368e87dd5f9c309134b7d62055d0e
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Aug 8 18:24:32 2011 +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 at samba.org>
Autobuild-Date: Tue Aug 9 01:53:17 CEST 2011 on sn-devel-104
(cherry picked from commit cf986f200804ce873b43c1ecf2d5e1bd08eb8a25)
(cherry picked from commit 07554082cc9d286ca0628179c9e7f7a493016a57)
commit bbbf2e2c0c37d9497583db797d36430cc74fd4ac
Author: Jeremy Allison <jra at samba.org>
Date: Sat Aug 20 20:47:40 2011 +0200
s3-vfs: Fix vfs_chown_fsp.
Fix bug #8370 (vfs_chown_fsp broken -- returns in the wrong directory).
(cherry picked from commit 909ff854168bf89e8502ff1994a926613ca5a1d5)
commit 51c9fc11ded9c69196964649aa1723425c63cf42
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 11 10:49:30 2011 +0200
s3:build(autoconf): fix bug #8369: remove irritating "." targets when recent system libs exist
(cherry picked from commit c544a744db67c2860065b1c5d70dc14ac0fa19ba)
commit a7c0b9c1a92792cf19539f94f0db53418656f712
Author: Michael Adam <obnox at samba.org>
Date: Wed Aug 10 13:41:14 2011 +0200
s3:idmap_tdb2: fix bug 8368 : correctly initialize "idmap config * : script" with NULL
this fixes the fallback to the deprecated spelling idmap:script
(cherry picked from commit 9a41e24753b49b8ef1653dde763fb0764884e616)
commit dc49eac35bbf6202bfa31fa1fc763d6bcbe6cbb4
Author: Herb Lewis <hlewis at panasas.com>
Date: Thu Jun 2 10:10:39 2011 -0700
Fix warning messages on Freebsd 4.6.2.
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit f0901792324425804592ac7032e3853b4d4c7829)
Fix bug #8365 (backport compiler warnings).
(cherry picked from commit 7039bbcd96a780965d69668d6541d316f7a4cd56)
commit 9b84f5293ef19460258eee34b6241c90153f2b7c
Author: Volker Lendecke <vl at samba.org>
Date: Thu Aug 11 16:52:22 2011 +0200
s3: Fix bug 8360
OS/2 sends an unexpected write&x/read&x chain
(cherry picked from commit 2aca833308049d005c647aabcd9d894f59698ef4)
commit 61d0b67ee737931fc23ffeb28ccc56830d161d0a
Author: Björn Baumbach <bb at sernet.de>
Date: Mon May 16 14:25:01 2011 +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 at samba.org>
Autobuild-User: Stefan Metzmacher <metze at 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).
(cherry picked from commit 8ddea73f7845ee59d4035d40da87664e21e96ed9)
commit 20aab0353b2996ad3163b1a7d6ee0e8432266ec1
Author: Björn Jacke <bj at sernet.de>
Date: Tue Aug 9 17:02:29 2011 +0200
s3:vfs_prealloc: fix build on SLES8
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User: Björn Jacke <bj at 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).
(cherry picked from commit 3f791d40daeaac748d5ebc86c8cbd8ce2c580aa9)
commit 0ac168e4a9633b1ae75a23c4e733ab7545a49c2c
Author: Volker Lendecke <vl at samba.org>
Date: Thu May 19 13:43:15 2011 +0200
s3: Do central cli_set_error (cherry picked from commit 0645deb1b4a70e45f88116fae16ec7f3a1b4d5ed)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Fix bug #7864 (cli_errstr() usage is wrong).
(cherry picked from commit 6b3b5f7dbe0cde783cf557f30865ef684e10ffd5)
commit 5ce82dc124c1f38e8271e907be4d5a44d5633139
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jul 29 15:25:23 2011 -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).
(cherry picked from commit 7803eec63dac2fa930ee3a33bcdb2921b5fb970a)
commit 12245f2c04c4cba3f25c19d7603ddc823cd1169e
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jul 29 16:36:58 2011 +0200
s3: Make map_open_params_to_ntcreate() available in lib/
(cherry picked from commit e7f68cc2a76edd8f7cccdc0445c6b9d61e111f46)
commit b617b38c195fd6bdae0f049fed4ec4b73560dd42
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jul 29 16:14:39 2011 +0200
s3: Make is_executable() available in lib/
(cherry picked from commit eb7a5a708ee39f3284983055a39889c98463366f)
commit 8acc6b222db2e03d9c5aaa6b317e2dcdba92c774
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jul 29 16:12:16 2011 +0200
s3: We only need base_name in map_open_params_to_ntcreate
(cherry picked from commit c9f921156534d38ea2a40d3c5ce8b99d308e5340)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 124 +++++++++++-
.../Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml | 2 +-
docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml | 2 +-
docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml | 2 +-
docs-xml/manpages-3/net.8.xml | 1 +
docs-xml/manpages-3/profiles.1.xml | 2 +-
docs-xml/manpages-3/samba.7.xml | 2 +-
docs-xml/manpages-3/vfs_acl_tdb.8.xml | 4 -
docs-xml/manpages-3/vfs_acl_xattr.8.xml | 4 -
docs-xml/manpages-3/vfs_aio_fork.8.xml | 86 ++++++++
.../smbdotconf/misc/allowinsecurewidelinks.xml | 37 ++++
docs-xml/smbdotconf/misc/widelinks.xml | 4 +
docs-xml/smbdotconf/protocol/smb2maxcredits.xml | 2 +-
docs-xml/smbdotconf/protocol/smb2maxread.xml | 4 +-
docs-xml/smbdotconf/protocol/smb2maxtrans.xml | 4 +-
docs-xml/smbdotconf/protocol/smb2maxwrite.xml | 4 +-
docs-xml/smbdotconf/protocol/unixextensions.xml | 4 +
lib/async_req/async_sock.c | 40 ++---
lib/talloc/talloc.3.xml | 6 +-
lib/talloc/talloc.c | 41 +++--
lib/talloc/talloc.h | 55 +++---
lib/talloc/talloc_guide.txt | 52 ++---
lib/talloc/testsuite.c | 45 ++++
lib/util/charset/iconv.c | 1 -
lib/util/debug_s3.h | 2 +
libcli/smb/smb2_create_blob.c | 7 +-
librpc/idl/security.idl | 1 +
source3/Makefile.in | 18 +-
source3/auth/server_info.c | 18 +-
source3/client/client.c | 2 +-
source3/configure.in | 4 +
source3/include/local.h | 6 +-
source3/include/proto.h | 9 +
source3/lib/netapi/netapi.c | 24 ++-
source3/lib/netapi/netapi.h | 6 +
source3/lib/serverid.c | 6 +-
source3/lib/util.c | 165 +++++++++++++++
source3/libnet/libnet_join.c | 31 ---
source3/libsmb/async_smb.c | 2 +
source3/libsmb/cliconnect.c | 50 ++---
source3/libsmb/clifile.c | 204 ++++++------------
source3/libsmb/clifsinfo.c | 9 -
source3/libsmb/clilist.c | 9 -
source3/libsmb/clioplock.c | 3 -
source3/libsmb/clirap.c | 12 -
source3/libsmb/clireadwrite.c | 10 -
source3/libsmb/clitrans.c | 3 -
source3/locking/locking.c | 8 +
source3/m4/aclocal.m4 | 6 +
source3/modules/gpfs.c | 1 +
source3/modules/nfs4_acls.c | 7 +-
source3/modules/vfs_acl_common.c | 17 ++-
source3/modules/vfs_acl_tdb.c | 2 -
source3/modules/vfs_acl_xattr.c | 2 -
source3/modules/vfs_aixacl2.c | 1 +
source3/modules/vfs_prealloc.c | 1 +
source3/param/loadparm.c | 23 ++-
source3/printing/nt_printing_migrate.c | 4 +
source3/registry/reg_format.c | 1 +
source3/rpc_server/spoolss/srv_spoolss_nt.c | 9 +
source3/rpc_server/srv_access_check.c | 11 +-
source3/rpc_server/wkssvc/srv_wkssvc_nt.c | 5 +
source3/smbd/globals.h | 8 +
source3/smbd/msdfs.c | 13 +-
source3/smbd/negprot.c | 6 +
source3/smbd/nttrans.c | 25 +++
source3/smbd/open.c | 176 +---------------
source3/smbd/posix_acls.c | 202 +++++-------------
source3/smbd/process.c | 32 ++--
source3/smbd/proto.h | 9 +-
source3/smbd/reply.c | 54 +++++-
source3/smbd/smb2_break.c | 16 +-
source3/smbd/smb2_close.c | 15 +-
source3/smbd/smb2_create.c | 39 ++--
source3/smbd/smb2_find.c | 28 ++--
source3/smbd/smb2_flush.c | 16 +-
source3/smbd/smb2_getinfo.c | 25 +--
source3/smbd/smb2_ioctl.c | 27 ++--
source3/smbd/smb2_keepalive.c | 17 +--
source3/smbd/smb2_lock.c | 16 +-
source3/smbd/smb2_negprot.c | 41 +++--
source3/smbd/smb2_notify.c | 18 +--
source3/smbd/smb2_read.c | 20 +--
source3/smbd/smb2_server.c | 221 +++++++++++++++++---
source3/smbd/smb2_sesssetup.c | 39 +---
source3/smbd/smb2_setinfo.c | 28 +--
source3/smbd/smb2_tcon.c | 40 ++--
source3/smbd/smb2_write.c | 25 +--
source3/smbd/trans2.c | 3 +-
source3/smbd/vfs.c | 10 +-
source3/winbindd/idmap_tdb2.c | 2 +-
source3/winbindd/wb_group_members.c | 9 +-
source3/winbindd/winbindd_cache.c | 2 +-
source3/winbindd/winbindd_dual.c | 9 +-
source4/torture/smb2/connect.c | 12 +-
source4/torture/smb2/read.c | 4 +-
96 files changed, 1378 insertions(+), 1056 deletions(-)
create mode 100644 docs-xml/manpages-3/vfs_aio_fork.8.xml
create mode 100644 docs-xml/smbdotconf/misc/allowinsecurewidelinks.xml
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index bf3950c..53c1cc4 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,6 +1,6 @@
=============================
Release Notes for Samba 3.6.1
- , 2011
+ October 20, 2011
=============================
@@ -8,11 +8,131 @@ This is the latest stable release of Samba 3.6.
Major enhancements in Samba 3.6.1 include:
+o Fix smbd crashes triggered by Windows XP clients (bug #8384).
+o Fix a Winbind race leading to 100% CPU load (bug #8409).
+o Several SMB2 fixes.
+o The VFS ACL modules are no longer experimental but production-ready.
+
Changes since 3.6.0:
--------------------
+o Michael Adam <obnox at samba.org>
+ * BUG 8368: Fix the fallback to the deprecated spelling idmap:script.
+
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 7509: smb_acl_to_posix: ACL is invalid for set (Invalid argument).
+ * BUG 8229: Fix 'widelinks' regression.
+ * BUG 8370: Fix vfs_chown_fsp.
+ * BUG 8412: Fix "saving as" of MS Office 2007 (Word) documents on Samba
+ shares with SMB2.
+ * BUG 8422: Fix infinite loop in ACL module code.
+ * BUG 8429: Compound SMB2 requests on an IPC connection can corrupt the
+ reply stream.
+ * BUG 8443: Be smarter about setting default permissions when a ACL_USER_OBJ
+ isn't given.
+ * BUG 8453: Fix smbclient segfaults when dialect option -m is used for
+ legacy dialects.
+ * BUG 8458: IE9 on Windows 7 cannot download files to samba 3.5.11 share.
+ * BUG 8473: smb2_find uses a hard coded max reply size of 0x10000 instead of
+ smb2_max_trans.
+ * BUG 8474: SMB2 create doesn't cope with an Apple client using NULL blob in
+ create.
+ * BUG 8476: Samba asserts when SMB2 client breaks the crediting rules.
+ * BUG 8477: Map to guest can return uninitialized blob of data.
+ * BUG 8493: DFS breaks zip file extracting unless "follow symlinks = no"
+ set.
+ * BUG 8494: Remove "experimental" label on VFS ACL modules.
+ * BUG 8507: smbd doesn't correctly honor the "force create mode" bits from a
+ cifsfs create.
+ * BUG 8509: Read-only handles on SAMR allow SAMR_DOMAIN_ACCESS_CREATE_USER.
+ * BUG 8521: Winbind cache timeout expiry test was reversed.
+
+
+o Christian Ambach <ambi at samba.org>
+ * BUG 8428: Fix wrong reply to DHnC (durable handle reconnect).
+ * BUG 8518: SMB2 create call returns incorrect file allocation size.
+
+
+o Björn Baumbach <bb at sernet.de>
+ * BUG 8364: Fix the build of gpfs.c on RHEL 6.0 with gpfs 3.4.0-4.
+
+
+o Bram <fnzon at lists.wizbit.be>
+ * BUG 7551: Return error of cli_push when 'put - /some/file' is used.
+
+
+o Ira Cooper <ira at wakeful.net>
+ * BUG 8395: Optimize serverid_exists() for Solaris.
+ * BUG 8442: NFSv4 DENY ACLs always include SYNCHRONIZE flag - blocking
+ renames.
+
+
+o Günther Deschner <gd at samba.org>
+ * BUG 8401: registry/reg_format.c must include includes.h.
+ * BUG 7465: Fix 'net ads join -k' when KRB5CCNAME is not set.
+
+
+o David Disseldorp <ddiss at suse.de>
+ * BUG 8480: acl_xattr can free an invalid pointer if no blob is loaded.
+ * BUG 8520: Fix SMB2 SMB2_OP_GETINFO and SMB2_OP_IOCTL parsing requirements.
+
+
+o Wilco Baan Hofman <wilco at baanhofman.nl>
+ * BUG 8455: Fix uninitialized memory problem in group_sids_to_info3.
+
+
+o Björn Jacke <bj at sernet.de>
+ * BUG 8256: Add man vfs_aio_fork.
+ * BUG 8363: Fix build of vfs_prealloc on SLES8.
+
+
+o Volodymyr Khomenko <Volodymyr_Khomenko at dell.com>
+ * BUG 8515: Disallow "." in can_set_delete_on_close().
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 7864: Fix usage of cli_errstr().
+ * BUG 8334: smb2: smbd logs "Invalid SMB packet: first request: 0x0008" and crashes.
+ * BUG 8338: Add a fallback for missing open&x support in MAC OS/X Lion.
+ * BUG 8360: OS/2 sends an unexpected write&x/read&x chain.
+ * BUG 8385: Fix smbclient access to NT4 shares.
+ * BUG 8409: Fix a Winbind race leading to 100% CPU load.
+ * BUG 8420: Fix 'getent group' if trusted domains are not reachable.
+ * BUG 8433: Fix segfault in iconv.c.
+ * BUG 8455: Samba PDC is looking up only primary user group.
+
+
+o Herb Lewis <hlewis at panasas.com>
+ * BUG 8365: Fix warning messages on Freebsd 4.6.2.
+
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 8407: SMB2 server can return requests out-of-order when processing
+ a compound request.
+ * BUG 8452: Check the wct of the incoming SMBnegprot responses.
+ * BUG 8473: smb2_find uses a hard coded max reply size of 0x10000 instead of
+ smb2_max_trans.
+ * BUG 8476: Don't call smbd_terminate_connection in
+ smb2_validate_message_id().
+ * BUG 8503: SMB2_OP_CANCEL requests don't have to be signed.
+ * BUG 8520: Fix SMB2 SMB2_OP_GETINFO and SMB2_OP_IOCTL parsing requirements.
+
+
+o SATOH Fumiyasu <fumiyas at osstech.co.jp>
+ * BUG 8390: Fix the build of vfs_aixacl2.c.
+
+
+o Andreas Schneider <asn at samba.org>
+ * BUG 8236: Empty notify servername.
+ * BUG 8351: While migrating forms, don't fail if the form already exists.
+
+
+o Andrew Tridgell <tridge at samba.org>
+ * BUG 8384: Fix smbd crashes triggered by Windows XP clients.
+
######################################################################
Reporting bugs & Development Discussion
@@ -24,7 +144,7 @@ joining the #samba-technical IRC channel on irc.freenode.net.
If you do report problems then please try to send high quality
feedback. If you don't provide vital information to help us track down
the problem then you will probably be ignored. All bug reports should
-be filed under the Samba 3.5 product in the project's Bugzilla
+be filed under the Samba 3.6 product in the project's Bugzilla
database (https://bugzilla.samba.org/).
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml b/docs-xml/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml
index 2ecfa4b..a6c1af0 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml
@@ -265,7 +265,7 @@ is the best tool in your network environment.
<para>
<indexterm><primary>LAN</primary></indexterm>
<indexterm><primary>thin client</primary></indexterm>
- ThinLinc an be used both in the LAN environment to implement a Thin Client strategy for an organization, and as
+ ThinLinc can be used both in the LAN environment to implement a Thin Client strategy for an organization, and as
secure remote access solution for people working from remote locations, even over smallband connections.
ThinLinc is free to use for a single concurrent user.
</para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml b/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
index 7058112..bb05de4 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
@@ -3716,7 +3716,7 @@ Just put it in a frame and bolt it to the wall with the heading "MY FIRST RPCCLI
<para>
<indexterm><primary>adddriver</primary></indexterm>
The setdriver command will fail if in Samba's mind the queue is not
-already there. A successful installation displys the promising message that the:
+already there. A successful installation displays the promising message that the:
<screen>
Printer Driver ABC successfully installed.
</screen>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml
index d431899..440498f 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml
@@ -366,7 +366,7 @@ Setting up Japanese charsets is quite difficult. This is mainly because:
In addition, although it is not directly concerned with Samba, since
there is a delicate difference between the iconv() function, which is
generally used on UNIX, and the functions used on other platforms,
- such as Windows and Java, so far is concerens the conversion between
+ such as Windows and Java, so far is concerns the conversion between
Shift_JIS and Unicode UTF-8 must be done with care and recognition
of the limitations involved in the process.
</para>
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index fac9ba6..5c16408 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -61,6 +61,7 @@
<variablelist>
&stdarg.help;
+ &stdarg.kerberos;
<varlistentry>
<term>-w target-workgroup</term>
diff --git a/docs-xml/manpages-3/profiles.1.xml b/docs-xml/manpages-3/profiles.1.xml
index 98046fc..fb33217 100644
--- a/docs-xml/manpages-3/profiles.1.xml
+++ b/docs-xml/manpages-3/profiles.1.xml
@@ -58,7 +58,7 @@
<varlistentry>
<term>-c SID1 -n SID2</term>
- <listitem><para>Change all occurences of SID1 in <filename>file</filename> by SID2.
+ <listitem><para>Change all occurrences of SID1 in <filename>file</filename> by SID2.
</para></listitem>
</varlistentry>
diff --git a/docs-xml/manpages-3/samba.7.xml b/docs-xml/manpages-3/samba.7.xml
index 888f75e..2a76dff 100644
--- a/docs-xml/manpages-3/samba.7.xml
+++ b/docs-xml/manpages-3/samba.7.xml
@@ -216,7 +216,7 @@
<term><citerefentry><refentrytitle>profiles</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
<listitem><para><command>profiles</command> is a command-line
- utility that can be used to replace all occurences of
+ utility that can be used to replace all occurrences of
a certain SID with another SID.
</para></listitem>
</varlistentry>
diff --git a/docs-xml/manpages-3/vfs_acl_tdb.8.xml b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
index 762364f..646c5ba 100644
--- a/docs-xml/manpages-3/vfs_acl_tdb.8.xml
+++ b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
@@ -40,10 +40,6 @@
<filename>$LOCKDIR/file_ntacls.tdb</filename>.
</para>
- <para>Please note that this module is
- <emphasis>experimental</emphasis>!
- </para>
-
<para>This module is stackable.</para>
</refsect1>
diff --git a/docs-xml/manpages-3/vfs_acl_xattr.8.xml b/docs-xml/manpages-3/vfs_acl_xattr.8.xml
index e1eb92a..d428cc2 100644
--- a/docs-xml/manpages-3/vfs_acl_xattr.8.xml
+++ b/docs-xml/manpages-3/vfs_acl_xattr.8.xml
@@ -44,10 +44,6 @@
</command>).
</para>
- <para>Please note that this module is
- <emphasis>experimental</emphasis>!
- </para>
-
<para>This module is stackable.</para>
</refsect1>
diff --git a/docs-xml/manpages-3/vfs_aio_fork.8.xml b/docs-xml/manpages-3/vfs_aio_fork.8.xml
new file mode 100644
index 0000000..af69d9a
--- /dev/null
+++ b/docs-xml/manpages-3/vfs_aio_fork.8.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="vfs_aio_fork.8">
+
+<refmeta>
+ <refentrytitle>vfs_aio_fork</refentrytitle>
+ <manvolnum>8</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">3.6</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+ <refname>vfs_aio_fork</refname>
+ <refpurpose>implement async I/O in Samba vfs</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>vfs objects = aio_fork</command>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This VFS module is part of the
+ <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+ <para>The <command>aio_fork</command> VFS module enables async
+ I/O for Samba on platforms where the system level Posix AIO
+ interface is insufficient. Posix AIO can suffer from severe
+ limitations. For example, on some Linux versions the
+ real-time signals that it uses are broken under heavy load.
+ Other systems only allow AIO when special kernel modules are
+ loaded or only allow a certain system-wide amount of async
+ requests being scheduled. Systems based on glibc (most Linux
+ systems) only allow a single outstanding request per file
+ descriptor. </para>
+
+ <para>To work around all these limitations, the aio_fork module
+ was written. It uses forked helper processes instead of the
+ internal Posix AIO interface to create asynchronousity for
+ read and write calls. It has no parameters, it will create
+ helper processes when async requests come in as needed. Idle
+ helper processes will be removed every 30 seconds.
+ </para>
+
+ <para>This module is stackable.</para>
+
+</refsect1>
+
+
+<refsect1>
+ <title>EXAMPLES</title>
+
+ <para>Straight forward use:</para>
+
+<programlisting>
+ <smbconfsection name="[cooldata]"/>
+ <smbconfoption name="path">/data/ice</smbconfoption>
+ <smbconfoption name="vfs objects">aio_fork</smbconfoption>
+</programlisting>
+
+</refsect1>
+
+<refsect1>
+ <title>VERSION</title>
+
+ <para>This man page is correct for version 3.6.0 of the Samba suite.
+ </para>
+</refsect1>
+
+<refsect1>
+ <title>AUTHOR</title>
+
+ <para>The original Samba software and related utilities
+ were created by Andrew Tridgell. Samba is now developed
+ by the Samba Team as an Open Source project similar
+ to the way the Linux kernel is developed.</para>
+
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/smbdotconf/misc/allowinsecurewidelinks.xml b/docs-xml/smbdotconf/misc/allowinsecurewidelinks.xml
new file mode 100644
index 0000000..a8a0991
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/allowinsecurewidelinks.xml
@@ -0,0 +1,37 @@
+<samba:parameter name="allow insecure wide links"
+ context="G"
+ type="boolean"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>
+ In normal operation the option <smbconfoption name="wide links"/>
+ which allows the server to follow symlinks outside of a share path
+ is automatically disabled when <smbconfoption name="unix extensions"/>
+ are enabled on a Samba server. This is done for security purposes
+ to prevent UNIX clients creating symlinks to areas of the server
+ file system that the administrator does not wish to export.
+ </para>
+ <para>
+ Setting <smbconfoption name="allow insecure wide links"/> to
+ true disables the link between these two parameters, removing
+ this protection and allowing a site to configure
+ the server to follow symlinks (by setting <smbconfoption name="wide links"/>
+ to "true") even when <smbconfoption name="unix extensions"/>
+ is turned on.
+ </para>
+ <para>
+ If is not recommended to enable this option unless you
+ fully understand the implications of allowing the server to
+ follow symbolic links created by UNIX clients. For most
+ normal Samba configurations this would be considered a security
+ hole and setting this parameter is not recommended.
+ </para>
+ <para>
+ This option was added at the request of sites who had
+ deliberately set Samba up in this way and needed to continue
+ supporting this functionality without having to patch the
+ Samba code.
+ </para>
+</description>
+<value type="default">no</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/widelinks.xml b/docs-xml/smbdotconf/misc/widelinks.xml
index 1c30bb7..da1374a 100644
--- a/docs-xml/smbdotconf/misc/widelinks.xml
+++ b/docs-xml/smbdotconf/misc/widelinks.xml
@@ -17,6 +17,10 @@
disabled (with a message in the log file) if the
<smbconfoption name="unix extensions"/> option is on.
</para>
+ <para>
+ See the parameter <smbconfoption name="allow insecure wide links"/>
+ if you wish to change this coupling between the two parameters.
+ </para>
</description>
<value type="default">no</value>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxcredits.xml b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
index 310b898..3cc219d 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
@@ -11,5 +11,5 @@ parameter for SMB1. You should never need to set this parameter.
<para>The default is 8192 credits, which is the same as a Windows 2008R2 SMB2 server.</para>
</description>
-<value type="default">128</value>
+<value type="default">8192</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxread.xml b/docs-xml/smbdotconf/protocol/smb2maxread.xml
index f4bcb4b..2666821 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxread.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxread.xml
@@ -8,10 +8,10 @@
<manvolnum>8</manvolnum></citerefentry> will return to a client, informing the client of the largest
size that may be returned by a single SMB2 read call.
</para>
-<para>The default is 1048576 bytes (1MB), which is the same as a Windows7 SMB2 server.</para>
+<para>The maximum is 65536 bytes (64KB), which is the same as a Windows Vista SMB2 server.</para>
</description>
<related>smb2 max write</related>
<related>smb2 max trans</related>
-<value type="default">1048576</value>
+<value type="default">65536</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
index dd654f4..1c01ccc 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
@@ -8,10 +8,10 @@
<manvolnum>8</manvolnum></citerefentry> will return to a client, informing the client of the largest
size of buffer that may be used in querying file meta-data via QUERY_INFO and related SMB2 calls.
</para>
-<para>The default is 1048576 bytes (1MB), which is the same as a Windows7 SMB2 server.</para>
+<para>The maximum is 65536 bytes (64KB), which is the same as a Windows Vista SMB2 server.</para>
</description>
<related>smb2 max read</related>
<related>smb2 max write</related>
-<value type="default">1048576</value>
+<value type="default">65536</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
index cdbc47a..a302a94 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
@@ -8,10 +8,10 @@
<manvolnum>8</manvolnum></citerefentry> will return to a client, informing the client of the largest
size that may be sent to the server by a single SMB2 write call.
</para>
-<para>The default is 1048576 bytes (1MB), which is the same as a Windows7 SMB2 server.</para>
+<para>The maximum is 65536 bytes (64KB), which is the same as a Windows Vista SMB2 server.</para>
</description>
<related>smb2 max read</related>
<related>smb2 max trans</related>
-<value type="default">1048576</value>
+<value type="default">65536</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/unixextensions.xml b/docs-xml/smbdotconf/protocol/unixextensions.xml
index d816648..61a39cb 100644
--- a/docs-xml/smbdotconf/protocol/unixextensions.xml
+++ b/docs-xml/smbdotconf/protocol/unixextensions.xml
@@ -14,6 +14,10 @@
Note if this parameter is turned on, the <smbconfoption name="wide links"/>
parameter will automatically be disabled.
</para>
+ <para>
+ See the parameter <smbconfoption name="allow insecure wide links"/>
+ if you wish to change this coupling between the two parameters.
+ </para>
</description>
<value type="default">yes</value>
diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index 2c90b6d..bb8518f 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -325,36 +325,24 @@ static void async_connect_connected(struct tevent_context *ev,
priv, struct tevent_req);
struct async_connect_state *state =
tevent_req_data(req, struct async_connect_state);
+ int ret;
- /*
- * Stevens, Network Programming says that if there's a
- * successful connect, the socket is only writable. Upon an
--
Samba Shared Repository
More information about the samba-cvs
mailing list