Jeremy Allison [Tue, 27 Sep 2011 17:23:08 +0000 (10:23 -0700)]
These modules are no longer experimental but production-ready (especially the acl_xattr code). Remove the "experimental" tag.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue Sep 27 21:00:12 CEST 2011 on sn-devel-104
(cherry picked from commit fa2236c066890b687483408ed0d82a4bb1f95157)
Fix bug #8494 (Remove "experimental" label on VFS ACL modules).
David Disseldorp [Fri, 23 Sep 2011 18:46:06 +0000 (11:46 -0700)]
Fix bug 8480 - acl_xattr can free an invalid pointer if no blob is loaded.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Sep 23 22:20:55 CEST 2011 on sn-devel-104
(cherry picked from commit ca8c25abebb8715176f68be9916217db9a8400dd)
Jeremy Allison [Thu, 22 Sep 2011 16:06:48 +0000 (09:06 -0700)]
Fix bug #8476 - Samba asserts when SMB2 client breaks the crediting rules.
Just drop the connection, not SMB_ASSERT.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Sep 22 19:41:31 CEST 2011 on sn-devel-104
(cherry picked from commit d50fa9c21e1c3b6f7126c33e24966099c7567225)
Jeremy Allison [Thu, 22 Sep 2011 20:42:56 +0000 (13:42 -0700)]
Fix bug #8477 - Map to guest can return uninitialized blob of data.
Found by Codenomicon at SNIA SDC.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Sep 23 03:19:46 CEST 2011 on sn-devel-104
(cherry picked from commit f0f91d0117b2ccf778382e61a411b5e4f0ea2b14)
Jeremy Allison [Wed, 31 Aug 2011 00:37:19 +0000 (17:37 -0700)]
Fix bug 8429 - Compound SMB2 requests on an IPC connection can corrupt the reply stream.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Aug 31 21:18:11 CEST 2011 on sn-devel-104
(cherry picked from commit 786fe9fab223723e4d2340f285592b2a44945d73)
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).
s3:smb2_server: make sure we prefer responses over requests on the client socket
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Aug 12 16:46:43 CEST 2011 on sn-devel-104
(cherry picked from commit 42cde0480bd6a5e2dddaa66917e1fa71e6a4edcd)
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.
Jeremy Allison [Mon, 29 Aug 2011 23:47:16 +0000 (16:47 -0700)]
Fix bug 8412 - Microsoft Office 2007 (Microsoft Word) fails to save as on a Samba share with SMB2. (cherry picked from commit dec3b21cd1737b317749e7ebced5aa1c2115ebdf)
Volker Lendecke [Fri, 26 Aug 2011 09:38:21 +0000 (11:38 +0200)]
s3: Use sys_read in fork_domain_child
I've seen
[2011/08/26 01:44:10.872057, 1] winbindd/winbindd_dual.c:1336(fork_domain_child)
fork_domain_child: Could not read child status: nread=-1, error=Interrupted system call
Volker Lendecke [Fri, 26 Aug 2011 09:39:41 +0000 (11:39 +0200)]
s3: Use sys_write in fork_domain_child
Counterpart for last checkin. A lot less likely, but not impossible in a child.
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Fri Aug 26 13:14:27 CEST 2011 on sn-devel-104
(cherry picked from commit e0e3d215b1902ecbeb3d469af9a196856711921e)
Volker Lendecke [Fri, 26 Aug 2011 14:54:18 +0000 (16:54 +0200)]
s3: Fix a winbind race leading to 100% CPU
This fixes a race condition that leads to the winbindd_children list becoming
corrupted. It happens when on a busy winbind SIGCHLD is a bit late.
Imagine a winbind with multiple requests in the queue for a single child. Child
dies, and before the SIGCHLD handler is called we find the socket to be dead.
wb_child_request_done is called, receiving an error from wb_simple_trans_recv.
It closes the socket. Then immediately the wb_child_request_trigger will do
another fork_domain_child before the signal handler is called. This means that
we do another fork_domain_child, we have child->sock==-1 at this point.
fork_domain_child will do a DLIST_ADD(winbindd_children, child) a second time
where the child is already part of that list. This corrupts the list. Then the
signal handler kicks in, spinning in
forever. Not good. This patch makes sure that both conditions (sock==-1 and not
part of the list) for a winbindd_child struct match up.
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Fri Aug 26 18:51:24 CEST 2011 on sn-devel-104
(cherry picked from commit ed058f4dc3e059967f3c0538bc220866e9c63588)
SATOH Fumiyasu [Mon, 22 Aug 2011 04:48:40 +0000 (13:48 +0900)]
s3: Fix the build of vfs_aixacl2.c
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Thu Aug 25 23:06:12 CEST 2011 on sn-devel-104
(cherry picked from commit faa769ec19b6486675048734837a6e2237d6f0a4)
Volker Lendecke [Mon, 22 Aug 2011 12:16:26 +0000 (14:16 +0200)]
s3: Fix bug 8385
Poll and select behave differently regarding error handling. When doing the
connect(2), we can not rely on poll telling us both readability and writability
upon error. Just always try a second connect(2). At least on Linux it returns 0
when it succeeded.
Signed-off-by: Jeremy Allison <jra@samba.org>
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Aug 25 19:39:12 CEST 2011 on sn-devel-104
(cherry picked from commit 50e30afa608dfdeae8a260730ead9761ed424dad)
Missing assignment means this loop will never terminate. Need to be applied
to 3.5.x and 3.6.1.
(cherry picked from commit 218cccfdf1820a9840a5cbc7df3915b6b58a762d)
Ira Cooper [Mon, 22 Aug 2011 19:46:41 +0000 (12:46 -0700)]
Fix bug #8395 - optimize serverid_exists() for Solaris.
jra asked:
Do you have any idea on how many calls it saves,
and what help the optimization gives ?
As far as calls: Not 100% sure, dtrace pointed the issue out to me, and when I
saw 10-50%(Or more), I looked for an easy fix.
The real expense here is the fnctl locks on the database. That's pretty
painful. 1000ns per call, and probably 3-4 calls in that chain. So it doesn't
take much to come out ahead was my math.
Andrew Tridgell [Fri, 29 Jul 2011 01:57:07 +0000 (11:57 +1000)]
talloc: added test suite for talloc_free_children()
this tests the fix from Simo
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Fri Jul 29 11:30:13 CEST 2011 on sn-devel-104
(cherry picked from commit d004fd0b53fb6f3ae64f0e24cf51f4471d434574)
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Apr 24 03:27:54 CEST 2011 on sn-devel-104
(cherry picked from commit fb05e82c99f0779bd44371a2bdafdd7147448dd5)
Andrew Tridgell [Mon, 8 Aug 2011 08:24:32 +0000 (18:24 +1000)]
talloc: ensure the sibling linked list remains valid during a free
This ensures that the sibling list of a pointer doesn't become invalid
during a free operation. It is an alternative fix to the fix in 6f51a1f45bf4de062cce7a562477e8140630a53d, and avoids the problem of
trying to calculate the parent pointer early
This should fix the subtle spoolss talloc bug that Simo found
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Tue Aug 9 01:53:17 CEST 2011 on sn-devel-104
(cherry picked from commit cf986f200804ce873b43c1ecf2d5e1bd08eb8a25)
Björn Baumbach [Mon, 16 May 2011 12:25:01 +0000 (14:25 +0200)]
s3-modules: Fix the build of gpfs.c on RHEL 6.0 with gpfs 3.4.0-4
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Wed May 18 11:58:14 CEST 2011 on sn-devel-104
(cherry picked from commit 192198ad70474e56d4708b65482eee976ea78a05)
Björn Jacke [Tue, 9 Aug 2011 15:02:29 +0000 (17:02 +0200)]
s3:vfs_prealloc: fix build on SLES8
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Tue Aug 9 19:29:08 CEST 2011 on sn-devel-104
(cherry picked from commit 1e76662ae6aa77d7b6e9e8a0266fcb1a1320a7fb)
Fix bug #8363 (vfs_prealloc build broken on SLES8).
Ignore fd events without EVENT_FD_READ or EVENT_FD_WRITE also in
run_events_poll(). They are ignore when building the array
for the syscall in event_add_to_poll_args(), so we need to
ignore them run_events_poll() too.
metze
Signed-off-by: Andreas Schneider <asn@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Aug 9 10:11:54 CEST 2011 on sn-devel-104
(cherry picked from commit 020032e114c0e966acf24f24e707942219d60cf3)
Fix bug #8358 (smbd exits with NT_STATUS_INTERNAL_ERROR in run_poll_events()).
s3:smb2_server: make sure we grant credits on async read/write operations (bug #8357)
Currently we skip, the "gone async" interim response on read and write,
this caused the aio code path to grant 0 credits to the client
in the read/write responses.
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Sun Aug 7 22:23:57 CEST 2011 on sn-devel-104
(cherry picked from commit 47bffb9b9243dc72d7305cd9ec3e63e176841bf5)
Björn Jacke [Thu, 4 Aug 2011 14:25:08 +0000 (16:25 +0200)]
s3/swat: use strlcat instead of strncat to fix build on old Linux distros
SLES 9's glibc for example had weird macros where the use of strncat resulted
in the use of strcat which we don't allow.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Thu Aug 4 17:50:24 CEST 2011 on sn-devel-104
(cherry picked from commit d3b4d75364210e2d2a4a1cd806f28b0021f22909)
s3:web/swat: use strtoll() instead of atoi/atol/atoll
This is more portable, as we have a strtoll replacement
in lib/replace.
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Sat Aug 6 11:55:45 CEST 2011 on sn-devel-104
(cherry picked from commit a6be0820d09b3f3eabfbb5f4356add303aa8a494)
Fix bug #8347 (CVE-2011-2522 regression for HP-UX, AIX and OSF).
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Tue Aug 2 22:33:15 CEST 2011 on sn-devel-104
(cherry picked from commit 5068a0d14df8cc6f1b4517c64f4356abc6606b58)
Fix bug #8343 (SMB2 crash reading with aio_fork beyond the end of file).
Jeremy Allison [Mon, 1 Aug 2011 18:49:10 +0000 (11:49 -0700)]
Fix bug 7462 - Non-standard SA_RESETHAND is used in ...lib/tevent/tevent_signal.c
Make SA_RESETHAND conditional on its existance.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Mon Aug 1 22:03:45 CEST 2011 on sn-devel-104
(cherry picked from commit 0c67efdd68b9808542c090b9fd9920e4e37d85d0)
Check for HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL instead of
CTDB_CONTROL_SCHEDULE_FOR_DELETION, which is an enum member and not a
define.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Jul 12 18:56:30 CEST 2011 on sn-devel-104
(cherry picked from commit b807c58b655f1ffbf849f5de9eef66136bdb4a52)
Jeremy Allison [Fri, 29 Jul 2011 18:17:03 +0000 (11:17 -0700)]
Second part of bugfix for bug #8335 - file copy aborts with smb2_validate_message_id: bad message_id
Modify the credit granting algorithm to closer to what I believe
Windows does.
Split up max_credits into 1/16ths, and then scale
the requested credits by how many 16ths have been
currently granted. Less than 1/16th == grant all
requested (100%), scale down as more have been
granted. Never ask for less than 1 if the client
asked for at least 1.
Michael Adam [Fri, 22 Jul 2011 08:11:52 +0000 (10:11 +0200)]
s3:loadparm: fix the reload of the configuration: also reload activated registry shares
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Fri Jul 22 16:53:49 CEST 2011 on sn-devel-104
(cherry picked from commit efbe1602bd014eada4811f336bdccbf4692d3807)
The last 2 patches address bug 8327 (config reload fails to reload shares from
registry).
Andrew Bartlett [Wed, 27 Jul 2011 02:04:26 +0000 (12:04 +1000)]
nbt: fix WinXP S3 domain join: alignment of nbt_netlogon_response_from_pdc
This fixes WinXP joining a Samba3 domain, which was broken on hosts
with an even number of characters in the host name. The alignment
requested in the structure was ignored because of the overall
NDR_NOALIGN set on the packet.
Andrew Bartlett
Fix bug #8326 (WinXP cannot join a Samba3 domain with a 'even' hostname).
Michael Adam [Fri, 24 Jun 2011 08:15:02 +0000 (10:15 +0200)]
s3:idmap_tdb2: remove the undocumented option of the silly name "tdb:idmap2.tdb"
In ancient times, when ctdb had not support for persistent databases and
tdb2 was introduced as a two-layer solution and it was more important than
today to be able to change the location of the permanent database file
because it had to reside on shared storage.
But these were times when idmap_tdb2 was not even officially released.
Nowadays, with ctdb handling the persistent idmap2.tdb database, the path
is stripped anyways, so this undocumented option has become unnecessary
and is hence removed.
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Wed Jul 27 05:37:57 CEST 2011 on sn-devel-104
(cherry picked from commit 3276060da4e7d495bd5cf5cbf7237e64d948ee77)
The last 10 patches address
bug #8328 (final cleanup of idmap_tdb2 code and docs needed for release).
Michael Adam [Tue, 7 Jun 2011 16:00:36 +0000 (18:00 +0200)]
s3:idmap_tdb2: deprecate the idmap:script parameter and use "idmap config * : script" instead
With this patch, "idmap config * : script" will override "idmap : script".
If "idmap : script" is present, a deprecation warning will be printed in any
case. If "idmap config * : script" is not set, then the value of "idmap :script"
will be used for backwards compatibility.
(cherry picked from commit b6c82f18f17cdded771d285930566c1d104686aa)
Kai Blin [Tue, 12 Jul 2011 06:08:24 +0000 (08:08 +0200)]
s3 swat: Create random nonce in CGI mode
In CGI mode, we don't get access to the user's password, which would
reduce the hash used so far to parameters an attacker can easily guess.
To work around this, read the nonce from secrets.tdb or generate one if
it's not there.
Also populate the C_user field so we can use that for token creation.