Stefan Metzmacher [Tue, 8 Nov 2011 16:50:43 +0000 (17:50 +0100)]
s3:smb2_server: grant credits in async interim responses (bug #8357)
The first fix for bug #8357 intruduced a regression, so that we no
longer grant credits for real async interim responses with
STATUS_PENDING.
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Wed Nov 9 11:56:29 CET 2011 on sn-devel-104
(cherry picked from commit
ffbd1ed2797616226a7987efd4b4dd4275c8c9d0)
(cherry picked from commit
ec72b6366701952e7d7574f22997b59858f887b0)
Stefan Metzmacher [Wed, 9 Nov 2011 15:04:09 +0000 (16:04 +0100)]
s3:smbd: don't limit the number of open dptrs for smb2 (bug #8592)
This fixes a crash bug that is triggered, when a client has more than
256 directory handles with searches.
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Nov 10 14:08:14 CET 2011 on sn-devel-104
(cherry picked from commit
22ddbb50534aa73240a171732d4ac1fa884fa412)
(cherry picked from commit
b3f98fc0366cd27c9e043591c70e283423fcd77e)
Stefan Metzmacher [Wed, 9 Nov 2011 14:59:22 +0000 (15:59 +0100)]
s3:smbd: fully construct the dptr before allocating a dnum in the bitmap
metze
(cherry picked from commit
39bb5a62977261d0926f56b792aacaa5e772ff6f)
(cherry picked from commit
798b63addf6aaecbe5b6241975f78103a56b1442)
Stefan Metzmacher [Thu, 10 Nov 2011 09:39:34 +0000 (10:39 +0100)]
s3:smbd: avoid string_set() in dir.c
And do some more error checks.
metze
(cherry picked from commit
7644547a5523b77bd49d9a5d979d5e4939153401)
(cherry picked from commit
785c0741af53cb142fc3ec7e55d999477d44d9bc)
Günther Deschner [Tue, 8 Nov 2011 15:00:10 +0000 (16:00 +0100)]
samr: filterModuleName is a lsa_String in userPwdChangeFailureInformation.
The entire marshalling of samr_ChangePasswordUser3 broke with
c2685cdedb430ae75a94e86f34484292b4269363.
Matthias, the bad effect of this change was that actually all failed password
change attempts will always return NT_STATUS_OK because the last 4 bytes (the
resulting status code) were not marshalled anymore.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Nov 9 00:41:13 CET 2011 on sn-devel-104
(cherry picked from commit
8a18edf1c2d553105cfcadec4d892e4e5a0fdba1)
The last 2 patches address bug #8591 (samr_ChangePasswordUser3 IDL incorrect).
(cherry picked from commit
4d52675716997057941390c5711850c36786ef15)
Günther Deschner [Tue, 8 Nov 2011 14:58:34 +0000 (15:58 +0100)]
s4-smbtorture: demonstrate how broken our samr_ChangePasswordUser3 marshalling is...
Guenther
(cherry picked from commit
bfe084bd8bbdfa0a0fa31521584f3bc142785fb8)
(cherry picked from commit
9c7925120a06a3511f88d768fd9c459023d3c0fe)
Christian Ambach [Thu, 20 Oct 2011 16:53:02 +0000 (18:53 +0200)]
s3:idmap_autorid: document allocation pool
document the need that excessive use of local users/group might
require increasing the rangesize
Autobuild-User: Christian Ambach <ambi@samba.org>
Autobuild-Date: Fri Oct 21 18:04:50 CEST 2011 on sn-devel-104
The last 4 patches address bug #8444 (idmap_autorid does not have allocation
pool).
(cherry picked from commit
a0cfd1983fae8b0090bcae36a11dad4531e48f49)
Christian Ambach [Thu, 20 Oct 2011 16:44:48 +0000 (18:44 +0200)]
s3:idmap_autorid: add an allocation range to autorid
this is needed to allocate gids for BUILTIN\Users and
BUILTIN\Administrators and for local users/group that
admins might want to create
autorid will now allocate one range for this purpose
and can so give out as many uids and gids as the
configured rangesize allows
(cherry picked from commit
a98095601dc585a6c49813399466a455c43fc0fc)
Christian Ambach [Thu, 20 Oct 2011 16:39:30 +0000 (18:39 +0200)]
s3:idmap_autorid: move HWM initialization into a function
we will need some more HWM soon, so move out initialization and
optimize the logic using the new interface of dbwrap_fetch_uint32
(cherry picked from commit
31593bcd74f4063217190012a83e1003e29fdba7)
Christian Ambach [Thu, 20 Oct 2011 16:22:19 +0000 (18:22 +0200)]
s3:idmap_autorid: use strings as parameter for range allocator
this prepares for allocation of non-domain ranges that cannot be
expressed by a SID (e.g. an allocation pool)
(cherry picked from commit
188a12e1df2a5a3ae39cb2e25c87ae2093a62853)
Andreas Schneider [Wed, 2 Nov 2011 15:53:27 +0000 (16:53 +0100)]
systemd: Fix dependencies.
Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Fri Nov 4 12:36:04 CET 2011 on sn-devel-104
(cherry picked from commit
4f3e86f62398218c454b979aaad75c7d7d3d8546)
The last 3 patches address bug #8575 (Add systemd files to 3.6).
(cherry picked from commit
81823a0e9d6cadd21e14c9f9ce16cc7ebf849e90)
David Disseldorp [Thu, 3 Nov 2011 11:54:00 +0000 (12:54 +0100)]
pkg: add comments to the systemd sysconfig file
Autobuild-User: David Disseldorp <ddiss@samba.org>
Autobuild-Date: Thu Nov 3 15:11:27 CET 2011 on sn-devel-104
(cherry picked from commit
0f61eb5e299abfa0ffe5e0dd92a40e582021a5b2)
(cherry picked from commit
a29a1be90608541c1f9f0142bb5b05965a2c4a34)
Andreas Schneider [Thu, 27 Oct 2011 15:11:19 +0000 (17:11 +0200)]
Add systemd service files.
Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Fri Oct 28 11:34:27 CEST 2011 on sn-devel-104
(cherry picked from commit
7d7ba3ba40895090d9bd791f210f89c5d5d2582e)
(cherry picked from commit
7c2ec923a1b904ceec7d5c18abb58d498ae201f4)
Stefan Metzmacher [Fri, 4 Nov 2011 11:52:44 +0000 (12:52 +0100)]
s3:libsmb: the workgroup in the non-extended-security negprot is not aligned (#8573)
I've tested the fix against NT4 sp6a, W2K sp4, W2K8R2 and Win8pre0.
metze
(similar to commit
aea76a3aaa7ea52f563e7bc8a8ed60d9651f9e34)
(cherry picked from commit
d0272d6ff1e2e33d710d5bee25a2781c67edc3a5)
Björn Baumbach [Mon, 7 Nov 2011 13:24:40 +0000 (14:24 +0100)]
s3-wafbuild: Fix inotify detection (bug 8580)
Enable inotify if sys or kernel inotify is available.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Nov 7 16:28:38 CET 2011 on sn-devel-104
(cherry picked from commit
b9e6c48678624ba5335d00906c558ea9e0086699)
(cherry picked from commit
8929b72433aea584f76519b0eabdab8b6423f5cf)
Björn Baumbach [Mon, 7 Nov 2011 11:42:28 +0000 (12:42 +0100)]
s3-build: Fix inotify detection (bug 8580)
Enable inotify if sys or kernel inotify is available.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit
846809853acd53a733fa6057436c6e51843d8fab)
(cherry picked from commit
5efb2cecf80bf7911755e583de59f4a015b864e8)
Stefan Metzmacher [Tue, 1 Nov 2011 17:55:17 +0000 (10:55 -0700)]
s3:smb2_server: FLAG_CHAINED means we always use the last session_id and tid
Based on master commit
91648aeb6409787c7766943225f5c7a9c695aa0b.
metze
The last 4 patches address bug #8560 (SMB2 doesn't handle compound request
headers in the same way as Windows).
(cherry picked from commit
2971e74fd522998d30b2923a2a308d8e28c04aa9)
Stefan Metzmacher [Tue, 30 Aug 2011 09:48:16 +0000 (11:48 +0200)]
smb2_constants: add SMB2_HDR_CREDIT_CHARGE
SMB2_HDR_EPOCH was never used and SMB 2.10 uses it as
SMB2_HDR_CREDIT_CHARGE.
We keep SMB2_HDR_EPOCH as alias for now, until all callers
are fixed.
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Aug 30 23:49:56 CEST 2011 on sn-devel-104
(cherry picked from commit
480a031c5b9a2ffe1e03e3fcb197e526e6d69e72)
(cherry picked from commit
7d297fa7ab21d265bdb9610068f4b6169ea0a5f9)
Stefan Metzmacher [Mon, 31 Oct 2011 22:15:09 +0000 (15:15 -0700)]
s3:smb2_server: don't reset the tid and session id in the out hdr of compound requests
Windows also leaves tid (0xFFFFFFFF) and session id (0xFFFFFFFFFFFFFFFF)
as the client requested them.
Based on commit
8d07d7148bf47ea14e62d39ed8a8cc4f1366810e from master.
metze
(cherry picked from commit
ab81a8df620a2d7fcb3852834353a0300dcb9f45)
Stefan Metzmacher [Thu, 27 Oct 2011 14:42:44 +0000 (16:42 +0200)]
s3:smb2_server: echo the SMB2_HDR_CREDIT_CHARGE and SMB2_HDR_SIGNATURE fields
Windows just echos back the given values by default.
metze
(cherry picked from commit
c7d3b6b2c38711943910aebff72b0188b0c346db)
(cherry picked from commit
3a9154c67647d209ad5300acfcf9d675d0a2e8e0)
Christian Ambach [Fri, 4 Nov 2011 16:34:48 +0000 (17:34 +0100)]
s3:smbd increase a debug level
logging disconnected clients with level 1 swamps the logs
(This fixes Bug #8585 Disconnecting clients swamp the logs)
(cherry picked from commit
0f836e532abcd7e24fd65d885a5b5c1d94ebefa1)
Henry Wong [Fri, 4 Nov 2011 18:20:10 +0000 (11:20 -0700)]
Properly fix bug #8384 - Windows XP clients seem to crash smbd process every once in a while.
Ensure we correctly null out the referenced pointer when we decrease the ref. count.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Nov 4 21:12:13 CET 2011 on sn-devel-104
(cherry picked from commit
51c86c8e67c3b026f49136f5b6743c279cc206d2)
(cherry picked from commit
cb6795bea659e884e23173960e68a2f970fc5dd3)
Günther Deschner [Thu, 3 Nov 2011 19:55:08 +0000 (20:55 +0100)]
examples: Fix perl path.
Fix bug #8176 (wall.perl example uses /usr/loca/bin for pat to perl binary).
(cherry picked from commit
2bec3bd80fc16699dfe8cc6aa3afd97881b8bfe9)
(cherry picked from commit
b01b1faafe32fbb88739ae8aaaf9f2fe5e1dcdcf)
Andreas Schneider [Thu, 27 Oct 2011 09:21:08 +0000 (11:21 +0200)]
s3-netlogon: Fix setting the machinge account password.
This bug has been found with uid wrapper.
(cherry picked from commit
bda9752b1036c4d4db76a526a79a091419bf757c)
Fix bug #8550 (Calls inside netr_set_machine_account_password() to set the
machine account password must be done as root).
(cherry picked from commit
3b4268ff0929740a2845a02a5b6f2596ff31f7f9)
Jeremy Allison [Fri, 28 Oct 2011 19:29:54 +0000 (12:29 -0700)]
Fix bug #8548 - winbind_samlogon_retry_loop ignores logon_parameters flags.
Fix confirmed by reporter.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Oct 28 23:04:47 CEST 2011 on sn-devel-104
(cherry picked from commit
f30f71c14a0b89dea296910ac9b92d3ae4016613)
(cherry picked from commit
110ee604f5d632a38af4a61295f7100fcfbd1d0a)
Jeremy Allison [Sat, 22 Oct 2011 01:08:46 +0000 (18:08 -0700)]
Fix bug #8542 - smbclient posix_open command fails to return correct info on open file.
(cherry picked from commit
d27f5a277ef47c5ff94e402930680b37e8f4d592)
Jeremy Allison [Sat, 22 Oct 2011 01:35:15 +0000 (18:35 -0700)]
Third part of fix for bug #8541 - readlink() on Linux clients fails if the symlink target is outside of the share.
Missed passing ucf_flags instead of hard coded flags in findfirst call.
(cherry picked from commit
49d2a796bed0273327d8919755023c4dbd6d8232)
(cherry picked from commit
074b9462e4b7b2b6e474566016e93a87c77e1599)
Jeremy Allison [Sat, 22 Oct 2011 00:46:12 +0000 (17:46 -0700)]
Second part of fix for bug #8541 - readlink() on Linux clients fails if the symlink target is outside of the share.
The statcache has to do lstat instead of stat when returning cached
posix pathnames.
(cherry picked from commit
305d7d7f7d76e37d82ce6ac257f178ce654b26db)
(cherry picked from commit
6529ac5424f75943b612daddaefb765b44aecdf7)
Jeremy Allison [Fri, 21 Oct 2011 21:12:41 +0000 (14:12 -0700)]
Fix bug #8541 - readlink() on Linux clients fails if the symlink target is outside of the share.
The key is to only allow the lookup to succeed if it's a UNIX level lookup or readlink,
but disallow all other operations.
(cherry picked from commit
d2ec9d20858b8e5256bf8339395c6f47793e0975)
(cherry picked from commit
a7d2815e97218c2b7eccbac25f78f2c2fae45a79)
Jeremy Allison [Mon, 25 Jul 2011 23:12:45 +0000 (16:12 -0700)]
Use existing ISDOT and ISDOTDOT macros.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Jul 28 02:09:20 CEST 2011 on sn-devel-104
(cherry picked from commit
d82256ca119eb8315cc69ba725ba71c386caa901)
(cherry picked from commit
99b4d6912570cc210035b2222ad57f4279792a2d)
Günther Deschner [Wed, 26 Oct 2011 13:03:23 +0000 (15:03 +0200)]
s3-netapi: remove pointless use_memory_krb5_ccache.
This breaks the ABI.
Guenther
See bug #7465 for more details.
(cherry picked from commit
2970d44442c2e6e80fb18f5c669d347e5f5be62e)
Björn Jacke [Thu, 20 Oct 2011 19:39:38 +0000 (21:39 +0200)]
s3:Makefile: make DSO_EXPORTS_CMD more portable (#8531)
It sems like every not completely trivial sed expression should be tested with
Solaris' sed. Its regexp engine is way more limited than the one of GNU
sed. Thanks to Michael Pelletier for finding this! This fixes bug #8531
Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Thu Oct 20 23:15:05 CEST 2011 on sn-devel-104
(cherry picked from commit
37be1df3d7534c2cc8e1e25614164c2178372b94)
(cherry picked from commit
763ad499aa4423c5e68a75f20f2ba8ee967e5984)
Jeremy Allison [Wed, 12 Oct 2011 00:00:08 +0000 (17:00 -0700)]
Add new contributing FAQ announcing acceptance of corporate (C).
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Oct 12 03:46:41 CEST 2011 on sn-devel-104
(cherry picked from commit
bd01ae227bc567fd7953e446236364fc4d110a48)
(cherry picked from commit
f165b54828f451943b172b8d2d1bfd15f37b7fdf)
Brad Smith [Wed, 12 Oct 2011 08:23:58 +0000 (04:23 -0400)]
Fix sys_fseek wrapper
Signed-off-by: Günther Deschner <gd@samba.org>
Fix bug #8525 (Bug with sys_fseek() wrapper on *BSD / OS X).
(cherry picked from commit
0f6b4b68db334028a5fa60c8615879a033286a4b)
Michael Adam [Thu, 29 Sep 2011 16:06:56 +0000 (18:06 +0200)]
s3:registry: fix the test for a REG_SZ blob possibly being a zero terminated ucs2 string
1. catch data blobs with odd number of bytes (not an ucs2 string at all)
2. test the right ucs2 character to be 0
(prevent out-of bounds access/potential segfault)
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Sun Oct 2 01:26:05 CEST 2011 on sn-devel-104
(cherry picked from commit
95bb2c23e6e9c52a1e34916dff05b1d306278bc6)
The last 2 patches address bug #8528 (SEGFAULT from net registry export on not
zero terminated REG_SZ values).
(cherry picked from commit
bc3af75ec9841753b5bfbcd04d9a412f7ee5c4b5)
Gregor Beck [Tue, 6 Sep 2011 07:24:10 +0000 (09:24 +0200)]
s3:registry: reg_format: handle unterminated REG_SZ blobs
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit
b9da4235566ffdd649d7b4a6ca05cecd02cfbd20)
(cherry picked from commit
11287cec6a53717c7abc5a54c2607f8ffb33d8bb)
Frank Lahm [Mon, 17 Oct 2011 18:10:29 +0000 (11:10 -0700)]
First part of fix for bug #8419 - Make VFS op "streaminfo" stackable.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Mon Oct 17 21:39:32 CEST 2011 on sn-devel-104
(cherry picked from commit
c3bdcab5161107be8155a7913d9cb325383a781d)
(cherry picked from commit
b8244184fe37da645f9544b68197707abe0d2ad3)
Frank Lahm [Thu, 13 Oct 2011 22:41:53 +0000 (15:41 -0700)]
Add support for VFS op streaminfo chaining in all relevant VFS modules.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Oct 14 03:26:06 CEST 2011 on sn-devel-104
(cherry picked from commit
7a0b5d6fc51d5d212529e82e5ed8e21516bfbe27)
(cherry picked from commit
7237535d10d657cac8c18af51648a12f2ab3309f)
Karolin Seeger [Thu, 20 Oct 2011 17:47:33 +0000 (19:47 +0200)]
WHATSNEW: Start release notes for Samba 3.6.2.
Karolin
(cherry picked from commit
289c5e342845042015dec2465a210dfa1e0672fc)
Karolin Seeger [Thu, 20 Oct 2011 17:44:15 +0000 (19:44 +0200)]
VERSION: Bump version up to 3.6.2.
Karolin
(cherry picked from commit
dc07af2c40d7d57cb27b1fe18c821e3bd8f711c1)
Karolin Seeger [Tue, 18 Oct 2011 18:45:34 +0000 (20:45 +0200)]
WHATSNEW: Update changes since 3.6.0.
Karolin
(cherry picked from commit
06e007da09f5162dc2fea60e2c799b516ce475e2)
Björn Jacke [Tue, 18 Oct 2011 08:54:56 +0000 (10:54 +0200)]
s3/doc: add man page for aio_fork vfs module
thanks to Volker for the content
Autobuild-User: Björn Jacke <bj@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)
Wilco Baan Hofman [Mon, 17 Oct 2011 19:24:41 +0000 (21:24 +0200)]
Fix uninitialized memory problem in group_sids_to_info3 (fixes bug #8455).
Autobuild-User: Jeremy Allison <jra@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)
Karolin Seeger [Sat, 15 Oct 2011 18:46:34 +0000 (20:46 +0200)]
WHATSNEW: Update changes since 3.6.0.
Karolin
(cherry picked from commit
47f1e507155cb601217e7263ff1d34774063eea3)
Jeremy Allison [Wed, 12 Oct 2011 16:43:18 +0000 (09:43 -0700)]
Fix bug #8521 - winbindd cache timeout expiry test was reversed
Found and fix reported by Micha Lenk <micha@lenk.info>. Thanks !
(cherry picked from commit
1e4761d05978b7a495d121acc1deaa7049f3911c)
(cherry picked from commit
78c8a1f74042738d6028636902cdb575a4359443)
Volker Lendecke [Fri, 16 Sep 2011 13:45:47 +0000 (15:45 +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@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)
Jeremy Allison [Wed, 12 Oct 2011 21:00:32 +0000 (14:00 -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@samba.org>
Autobuild-User: Stefan Metzmacher <metze@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)
Stefan Metzmacher [Wed, 12 Oct 2011 15:46:50 +0000 (17:46 +0200)]
s3:smb2_server: get/set info are limited by max_trans size (bug #8473)
metze
Autobuild-User: Stefan Metzmacher <metze@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)
Stefan Metzmacher [Wed, 12 Oct 2011 14:58:46 +0000 (16:58 +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)
Stefan Metzmacher [Fri, 23 Sep 2011 15:18:14 +0000 (17:18 +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)
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)
(cherry picked from commit
69be2b1cd34cec481c252883a6713c1ed672a7f8)
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)
(cherry picked from commit
8d54841f640212a5c3d026df3fbfd1f7c99ac7f7)
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)
(cherry picked from commit
84b4cd03a17e84ffd311b99ec73846a29507418d)
Karolin Seeger [Wed, 12 Oct 2011 19:56:27 +0000 (21:56 +0200)]
WHATSNEW: Update changes since 3.6.0.
Karolin
(cherry picked from commit
60b85eada6e1289b76865e6b4797f2fe0134cfaa)
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)
(cherry picked from commit
0953c4b9ebc06518920b9d49de16dfaeb7d69a35)
Karolin Seeger [Wed, 12 Oct 2011 19:44:52 +0000 (21:44 +0200)]
WHATSNEW: Update changes since 3.6.0.
Karolin
(cherry picked from commit
810c0a8c32b1031aedae49e7a4d971e04c83f0eb)
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).
(cherry picked from commit
18d7c0cd25b1fe09a361a332a9191c92bb5a315e)
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)
(cherry picked from commit
e68fae451f4e1feb48484d0e28ed5fad1df7ca55)
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)
(cherry picked from commit
349a7a5005609fadbec71d7a033b95757f23a59a)
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)
(cherry picked from commit
fdb15df44a5ee4101b9e0c9bcdd07e48f6ce24fc)
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)
(cherry picked from commit
52d0bde69a67c1a3a6798b496eec75ca1d3259f2)
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)
(cherry picked from commit
fb1c61880c962f26a28a45ffc9c8680edad65488)
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)
(cherry picked from commit
10e5d1c6361fb309de0b2dd291deefb69c6506e6)
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)
(cherry picked from commit
56b765a8663f59d247f970af8273ba749f094cae)
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)
(cherry picked from commit
ecfbe10edab6bd1a6a30cc4e1a19f3289d58455c)
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)
(cherry picked from commit
c9e510cd3d509999d6a6ed813c2a4ebff7b5456c)
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)
(cherry picked from commit
12869c065fe164e02425ef44f4879b11ea0e7baf)
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)
(cherry picked from commit
0d217c5f9c725926b6a58373af59e8bca3dd6edc)
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)
(cherry picked from commit
73aa7eee9af008a5dad96d658c4d3d5b5148cce6)
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)
(cherry picked from commit
f45348edea0b2ee8b397e7236dc7786cbce96c19)
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)
(cherry picked from commit
2bd03ad79a4afcb419513185defdeb7aff69427b)
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)
(cherry picked from commit
5ec26db056b7bb86be4a09f1999fadc383001d57)
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)
(cherry picked from commit
4e4817930955228923f04540404786ff88ad14f8)
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)
(cherry picked from commit
27f3f2617a5de7797458b6d39ddf7ab6212d0949)
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)
(cherry picked from commit
b4190c336dc344f96c4bb837da1e7e923abffca5)
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)
(cherry picked from commit
32e0306924ade89c67970c6714bd2033056b3792)
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)
(cherry picked from commit
fd01ec18dc84b4d632bf9384705d72f2a970cf65)
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)
(cherry picked from commit
f32047b23d6e16e4cc75ae0b3beaf7b34307703c)
Stefan Metzmacher [Mon, 3 Oct 2011 21:50:48 +0000 (14:50 -0700)]
s3:smb2_server: add smbd_smb2_request_verify_sizes()
metze.
(cherry picked from commit
fd6abe0c92cb22d26615ea443e0ede288ab37a6e)
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).
(cherry picked from commit
762811de03b719ae9b69ac4e7b94a3db224c1ab9)
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
(cherry picked from commit
df6a64bb0bc181c76d1e3c05e19414dd9e9709f5)
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
(cherry picked from commit
2a9792f4d9963e4b4cbd38da47d8296694333269)
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)
(cherry picked from commit
46798c8dea820ae91e7ed48f2a673d321b4676bc)
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)
(cherry picked from commit
8678e2158064e075ed276a2a4f1ac552903af414)
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)
(cherry picked from commit
495d164e8f3ac7d3064c48fe785f8d443f2f63ad)
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)
(cherry picked from commit
0ccce6e5a212859849c77f8a5e02790b8f17deaa)
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)
(cherry picked from commit
04d31e65ee5e6552e806b342eb32af264661a7bc)
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)
(cherry picked from commit
928523b7878757e11bdec1cb89fa7b3e7e12f115)
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)
(cherry picked from commit
5253d36689115672f35ea8fffdcf509587900135)
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)
(cherry picked from commit
589bea9d314e14b8a493acdb31104f731073cafa)
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)
(cherry picked from commit
0bb1e5919a5f3dd3a290f7dd082b3e67c95b37c6)
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)
(cherry picked from commit
5e06c88de7bc4fe215c8630d9c3b6861f18d63bf)
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)
(cherry picked from commit
7f3a6c5631f901240d9e460b16d1df81e6f66e2d)
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)
(cherry picked from commit
27c49f085a16da709e64e0f50df535edcb524b77)
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)
(cherry picked from commit
5f4eb867b1297493473b0d652c7e3d0d21260bf8)
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
(cherry picked from commit
149875f887287dbbf016d2252962b023b0bae967)
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)
(cherry picked from commit
e6b33a5a3f83272d7e6dea66b1f15db4b19d3170)
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).
(cherry picked from commit
3d2c591ff6ce75317556de8ad522c73e5cc8f614)
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
(cherry picked from commit
bd5d9d9fba23ea585b701c41ec27482a0076729e)
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).
(cherry picked from commit
bdf1c399646a0a968a4360c65be2db8089e6ab8d)