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.
Kai Blin [Thu, 7 Jul 2011 08:03:33 +0000 (10:03 +0200)]
s3 swat: Fix possible XSS attack (bug #8289)
Nobuhiro Tsuji of NTT DATA SECURITY CORPORATION reported a possible XSS attack
against SWAT, the Samba Web Administration Tool. The attack uses reflection to
insert arbitrary content into the "change password" page.
This patch fixes the reflection issue by not printing user-specified content on
the website anymore.
and ensure they are called whenever we are operating on smb_ucs2_t
variables. I'd like to make the definition of smb_ucs2_t incompatible
with int and codepoint_t so they can't be mixed, but that's a patch
for another time.
s3:smb2_create: use smbd_calculate_access_mask() instead of smbd_check_open_rights()
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Jul 11 22:45:01 CEST 2011 on sn-devel-104
(cherry picked from commit f5d320ac0fb74d4ad95a03969366096e9b074379)
The last 10 patches address bug #8102 (domuser can change ACL from his files
over the network).
We can't allow open with access that has been denied via the share
security descriptor
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Jul 5 16:21:54 CEST 2011 on sn-devel-104
(cherry picked from commit 4deca5d72804a40e68158a1183f5633dabf24761)
s3:smb2_server: add some comments about change_to_user() and change_to_root_user()
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Jul 8 13:45:46 CEST 2011 on sn-devel-104
(cherry picked from commit dbfb88aef30a755c29015bff4699eb17925a4988)
The last 3 patches address bug #8292 (Disable SMB2 for 3.6).
s3:smb2_server: there's no reason to check the session id twice on a smb2_tcon request
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Jul 4 17:34:13 CEST 2011 on sn-devel-104
(cherry picked from commit 7c96e96e9881ec1ad7b41f0ab241a5b0ac17b93f)
Jeremy Allison [Thu, 7 Jul 2011 21:59:41 +0000 (14:59 -0700)]
Fix bug #8293 - SMB2 doesn't rotate the log files often enough.
Move the num_requests field out of the smb1 struct into the generic
struct smbd_server_connection struct. Use it to count SMB2 requests
as well as SMB1 and ensure that check_log_size() is called every 50
SMB2 requests.
Günther Deschner [Thu, 12 May 2011 12:33:15 +0000 (14:33 +0200)]
s3-waf: stop building smbtortre4.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu May 12 15:35:02 CEST 2011 on sn-devel-104
(cherry picked from commit c1ac023b588e1ca676cbbf542ca6f93aa199ad32)
Christian Ambach [Wed, 29 Jun 2011 13:01:16 +0000 (15:01 +0200)]
s3:smbd do not panic when CTDB is unhealthy (Bug #8278)
when CTDB is unhealthy, log a message and exit cleanly
instead of creating a core file
Autobuild-User: Christian Ambach <ambi@samba.org>
Autobuild-Date: Thu Jun 30 13:18:12 CEST 2011 on sn-devel-104
(cherry picked from commit 847ca0a5d791d881be8d9a0721bf30399c80013b)
Jeremy Allison [Wed, 29 Jun 2011 16:56:47 +0000 (09:56 -0700)]
Second part of fix for bug #8219 - SMB Panic from Windows 7 Client.
Pass in the correct vector to the signing algorithm in an async
response - we must start with vector[1] which has the SMB2_HDR_BODY
length, not vector[0] which is the 4 byte packet length. Also
note we're passing in 2 vectors not 3.
Volker Lendecke [Mon, 27 Jun 2011 12:34:39 +0000 (14:34 +0200)]
s3: explicitly pass domain_sid to wbint_LookupRids() (bug #7841)
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Mon Jun 27 18:21:30 CEST 2011 on sn-devel-104
(cherry picked from commit 0a74caa473f491050bc5f64b6d6956c00088c5cd)
s3:rpc_server/svcctl: fix valgrind bug in _svcctl_QueryServiceObjectSecurity()
r->out.buffer needs to stay in its size, as it will be marshalled completely.
As it's preallocated and initialized with zeros, we just need to copy
the payload into it, even if it's smaller than the offered buffer size.
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Jun 16 14:15:47 CEST 2011 on sn-devel-104
(cherry picked from commit 67512152c007bb186e4fd8dac5d1aab89bce0689)
The last 3 patches address bug #8264 (svcctl valgrind fixes).
s3:rpc_server/svcctl: fix valgrind bugs in _svcctl_QueryServiceConfig2W()
r->out.buffer needs to stay in its size, as it will be marshalled completely.
As it's preallocated and initialized with zeros, we just need to copy
the payload into it.
If we always marshall the return buffer, we already have the needed
buffer size and don't need to call ndr_size_* functions.