Christian Ambach [Fri, 15 Jul 2011 13:44:36 +0000 (15:44 +0200)]
s3:utils/net_afs fix compiler warnings
this also fixes the usage displays of net afs
(cherry picked from commit
7738d8b89bcf2b43d65f1bf4599a688cb4143768)
Christian Ambach [Fri, 15 Jul 2011 13:54:25 +0000 (15:54 +0200)]
s3:lib/afs fix the build with --with-vfs-afsacl
This fixes the second piece of Bug #8263
(cherry picked from commit
8a14ccb99388e31b366fc84060186be1ea708d75)
Christian Ambach [Fri, 15 Jul 2011 13:27:07 +0000 (15:27 +0200)]
s3:lib/afs fix the build with --with-fake-kaserver
This fixes one piece of Bug #8263
(cherry picked from commit
caa4226c315a70138016cf8fae13ce3f050057e7)
Jeremy Allison [Fri, 22 Jul 2011 23:42:51 +0000 (16:42 -0700)]
Fix bug 8314] - smbd crash with unknown user.
All other auth modules code with being called with
auth_method->private_data being NULL, make the auth_server
module cope with this too.
(cherry picked from commit
e173f04a822944e96171866d9fbf43301cd611a4)
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.
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit
589bc35590aebfdd20fe786c08005bb43ef47d94)
Kai Blin [Sat, 9 Jul 2011 07:52:07 +0000 (09:52 +0200)]
s3 swat: Add time component to XSRF token
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit
fb0d393a1972c28ecd6e49959c8c5b7900e1b574)
Kai Blin [Fri, 8 Jul 2011 13:06:13 +0000 (15:06 +0200)]
s3 swat: Add XSRF protection to printer page
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit
3b138403ea157f1c6b8dfc40016f293831765948)
Kai Blin [Fri, 8 Jul 2011 13:05:38 +0000 (15:05 +0200)]
s3 swat: Add XSRF protection to password page
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit
395503b9f51445d9ca493c2fc7e6022ee75cb743)
Kai Blin [Fri, 8 Jul 2011 13:04:48 +0000 (15:04 +0200)]
s3 swat: Add XSRF protection to shares page
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit
869590cc3a0c09e11f77277af1d3b7334b718ce0)
Kai Blin [Fri, 8 Jul 2011 13:04:12 +0000 (15:04 +0200)]
s3 swat: Add XSRF protection to globals page
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit
dc3aa10bbc5936aebab88db2ea34b46648839745)
Kai Blin [Fri, 8 Jul 2011 13:03:44 +0000 (15:03 +0200)]
s3 swat: Add XSRF protection to wizard page
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit
e33970f1c60451a063bb2eeb64f9515c64722508)
Kai Blin [Fri, 8 Jul 2011 13:03:15 +0000 (15:03 +0200)]
s3 swat: Add XSRF protection to wizard_params page
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit
a887d8446bc74b255682a4047cb5616fe236bcaf)
Kai Blin [Fri, 8 Jul 2011 13:02:53 +0000 (15:02 +0200)]
s3 swat: Add XSRF protection to viewconfig page
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit
bb9bb437fc3685879f5b34c444d58c4a564f148d)
Kai Blin [Fri, 8 Jul 2011 10:58:53 +0000 (12:58 +0200)]
s3 swat: Add XSRF protection to status page
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit
d240094fbe7b581a6c97f506fa17747e21180598)
Kai Blin [Fri, 8 Jul 2011 10:57:43 +0000 (12:57 +0200)]
s3 swat: Add support for anti-XSRF token
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit
5e32110742a310aff6946acd34b0dca3a3fc8130)
Kai Blin [Fri, 8 Jul 2011 10:56:21 +0000 (12:56 +0200)]
s3 swat: Allow getting the user's HTTP auth password
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit
4592956a35d700aaf4ec2be7fc183f42fbe14fba)
Karolin Seeger [Sun, 24 Jul 2011 19:09:38 +0000 (21:09 +0200)]
s3-swat: Fix typo.
Thanks to Simo for reporting!
Karolin
(cherry picked from commit
9f73c1990a19daa899fa5345530a867e69a5be94)
(cherry picked from commit
bcb052c29212954a3ed10c9f095c51e4e0a96af5)
(cherry picked from commit
43cf67654ebcfd3f0a8298af7f6cf15cd5f2d981)
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.
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit
d88744f460a2a65d4e0cfb6c944f90f09e15d3b4)
Stefan Metzmacher [Tue, 28 Jun 2011 10:52:37 +0000 (12:52 +0200)]
release-scripts/create-tarball: always create a tag in form of samba-${version}
metze
(cherry picked from commit
84d9cdb5112e55ae8a1e525ca2b8cef2ae606f22)
(cherry picked from commit
d7242cb7fcfca687a4b9c20c4084c74b12fc5aad)
Jeremy Allison [Tue, 19 Jul 2011 20:08:31 +0000 (13:08 -0700)]
Second part of fix for bug 8310 - toupper_ascii() is broken on big-endian systems.
Re-add:
smb_ucs2_t toupper_w(smb_ucs2_t v);
bool isupper_w(smb_ucs2_t v);
smb_ucs2_t tolower_w(smb_ucs2_t v);
bool islower_w(smb_ucs2_t v);
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.
(cherry picked from commit
bdc078a81e49bce3b51560a75984e0306c387573)
Jeremy Allison [Tue, 19 Jul 2011 19:21:23 +0000 (12:21 -0700)]
First part of fix for bug 8310 - toupper_ascii() is broken on big-endian systems
Remove
int toupper_ascii(int c);
int tolower_ascii(int c);
int isupper_ascii(int c);
int islower_ascii(int c);
and replace with their _m equivalents, as they are identical.
(cherry picked from commit
5b6a34128a0e0bc33c255dc53c9fb9fd8e6d34d8)
Jeremy Allison [Sat, 16 Jul 2011 04:36:13 +0000 (21:36 -0700)]
Fix bug #8307 - brl_close_fnum does not call SMB_VFS_BRL_UNLOCK_WINDOWS on all locks
Reported by herb@samba.org. Remove the (premature) optimization
on file close.
(cherry picked from commit
c5b272a05c4bd9d7f70c14fe307b8da46b9e607e)
Karolin Seeger [Wed, 13 Jul 2011 19:52:32 +0000 (21:52 +0200)]
WHATSNEW: Update changes since rc2.
Karolin
(cherry picked from commit
8585ac3635e9ae284a5b35dba2412d996a73f7ad)
Stefan Metzmacher [Sun, 10 Jul 2011 11:09:06 +0000 (13:09 +0200)]
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).
(cherry picked from commit
d43d147c9d69dd23296677f9ae998c9362771682)
Stefan Metzmacher [Sun, 10 Jul 2011 11:02:11 +0000 (13:02 +0200)]
s3:smb2_tcon: return the correct maximal_access on the share
metze
(cherry picked from commit
a1046389ffcc476456ac76cb701a4325d1c42ef9)
(cherry picked from commit
89a05c3a54239d384317f9881430fac264138f3f)
Stefan Metzmacher [Mon, 11 Jul 2011 14:12:57 +0000 (16:12 +0200)]
s3:smbd: return the real share access mask in the SMBtconX response
metze
(cherry picked from commit
58eed1b295afeff6acfb8c1f10b0bb02280fd491)
(cherry picked from commit
c384bf75284fa7280b9279d305c5404f9f1066df)
Stefan Metzmacher [Sun, 10 Jul 2011 11:59:40 +0000 (13:59 +0200)]
s3:smbd: use smbd_calculate_access_mask() also for fake_files
metze
(cherry picked from commit
581d8fa36b73abab030168dc35fb631ccd42a388)
(cherry picked from commit
3e8770619c53c956f623ae852f97e6226513898d)
Stefan Metzmacher [Sun, 10 Jul 2011 11:03:51 +0000 (13:03 +0200)]
s3:smbd: check the share level access mask in smbd_calculate_access_mask()
I think we should reject invalid access early,
before we might create new files.
Also smbd_check_open_rights() is only called if the file existed.
metze
(cherry picked from commit
896f105ed40dc04f83bcbfac367b309c8d957f86)
(cherry picked from commit
d43f7ffb9fa8449a954d2e9fc9012a00289b41e2)
Stefan Metzmacher [Sun, 10 Jul 2011 11:00:25 +0000 (13:00 +0200)]
s3:smbd: make smbd_calculate_access_mask() non-static
metze
(cherry picked from commit
ce66d4e4a885add09edfa8e6d5eab0f3b5d63081)
(cherry picked from commit
5a1c2b4774c914a45bf2da7e666f6acf7f6927c6)
Stefan Metzmacher [Tue, 12 Jul 2011 15:31:13 +0000 (17:31 +0200)]
s3:smbd/msdfs: let create_conn_struct() check the share security descriptor
metze
(cherry picked from commit
18f967a24881aa899b39f7676fc70a7f7aaca07b)
(cherry picked from commit
bd91cb862c4ceb3955c742d1c516e51733a19e6e)
Volker Lendecke [Tue, 5 Jul 2011 09:13:07 +0000 (11:13 +0200)]
s3: Fix bug 8102
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)
(cherry picked from commit
b3a035005ef98bcb31bade50a9e3ddf088302779)
Volker Lendecke [Mon, 4 Jul 2011 16:35:21 +0000 (18:35 +0200)]
s3: Calculate&store the maximum share access mask
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit
720fa46f9443ccbe471b265f1c2b9cb9782a3c26)
(cherry picked from commit
83c6e9d3ad76e8009778e5ba0bf22e256d06ad48)
Volker Lendecke [Mon, 4 Jul 2011 15:02:34 +0000 (17:02 +0200)]
s3: Return "granted" from share_access_check
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit
1c022d2e414607633323e65abbc63bb3aeaaa6a4)
(cherry picked from commit
283f76c06308eaeaf9d134e0bfb45188ee684fb3)
Stefan Metzmacher [Fri, 8 Jul 2011 07:08:39 +0000 (09:08 +0200)]
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).
(cherry picked from commit
7b28ae90603ff152e31b2113109bdaebc540810f)
Stefan Metzmacher [Thu, 7 Jul 2011 14:38:33 +0000 (16:38 +0200)]
s3:smb2_server: call change_to_root_user() or smbd_smb2_request_check_tcon()
For all requests which don't operate on a tcon, we should call
change_to_root_user(), to match the SMB1 behavior.
For SMB1 we do the following operations without AS_USER:
/* 0x70 */ { "SMBtcon",reply_tcon,0},
/* 0x71 */ { "SMBtdis",reply_tdis,DO_CHDIR},
/* 0x72 */ { "SMBnegprot",reply_negprot,0},
/* 0x73 */ { "SMBsesssetupX",reply_sesssetup_and_X,0},
/* 0x74 */ { "SMBulogoffX",reply_ulogoffX, 0}, /* ulogoff doesn't give a valid TID */
/* 0x75 */ { "SMBtconX",reply_tcon_and_X,0},
...
/* 0x2b */ { "SMBecho",reply_echo,0},
...
/* 0xa4 */ { "SMBntcancel",reply_ntcancel, 0 },
For SMB2tdis we still call smbd_smb2_request_check_tcon()
as close_cnum() calls change_to_root_user() when needed.
metze
Signed-off-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit
eea210eba7c20e6d04b13cf8ccd3011ee7c99157)
(cherry picked from commit
3de9d2204e1f14c8a1d9642f3dc1e1e7e1013210)
Stefan Metzmacher [Mon, 4 Jul 2011 13:57:20 +0000 (15:57 +0200)]
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)
(cherry picked from commit
fe6a325226a5fb17e5ccf62c5d0882d97baa35b7)
Karolin Seeger [Wed, 13 Jul 2011 19:21:23 +0000 (21:21 +0200)]
WHATSNEW: Update changes since rc2.
Karolin
(cherry picked from commit
ae414153864100daa616b169b1b55e2d903b590c)
Karolin Seeger [Wed, 13 Jul 2011 19:20:56 +0000 (21:20 +0200)]
VERSION: Set version to 3.6.0rc3.
Karolin
(cherry picked from commit
7bbf4bc9870c5a9b02a40d321b2efdb86b0440d2)
Jeremy Allison [Tue, 12 Jul 2011 20:06:13 +0000 (13:06 -0700)]
Fix bug #Bug 8304 - Uninitialized variable referenced in error path.
princ must not be used uninitialized. auth_data is not used at all.
(cherry picked from commit
ba6f88a6720358bea75b162f193182b724b9411c)
Günter Kukkukk [Wed, 13 Jul 2011 13:10:13 +0000 (06:10 -0700)]
Fix bug 8305 - nmbd segfaults - when using "smbtree ..." (cherry picked from commit
102a931c8081559423fb25b3a4d445b6f2e790ac)
(cherry picked from commit
e5f4b6e7aa1d102db023a491991684118875ee38)
Karolin Seeger [Tue, 12 Jul 2011 19:11:34 +0000 (21:11 +0200)]
s3-docs: Remove manpages for ldb tools.
Fix bug #8297 (ldb tools man pages should be removed from the release tar
ball).
Thanks to Björn for reporting!
Karolin
(cherry picked from commit
73e6673078ef8477107cf94a9d53f3d2b42cb6d7)
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.
(cherry picked from commit
b7dbbe1005627932ab959144002f9d41adb04328)
Günther Deschner [Fri, 8 Jul 2011 15:17:17 +0000 (17:17 +0200)]
s3-waf: split out LIBCLI_WINREG_INTERNAL as LIBCLI_WINREG was pulling in rpc server code in undesired places.
Andreas, please check.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Jul 8 18:34:44 CEST 2011 on sn-devel-104
(cherry picked from commit
f4add4fbf545313f5d24e0d9e5c9eb0f8fac630a)
Conflicts:
source3/rpc_server/wscript_build
source3/wscript_build
The last 21 patches address bug #8214 (printer driver upgrade fails, causing
smbd to exit on startup).
(cherry picked from commit
9a555e0271c333d1e33a9f2df435166aa8c6dfde)
David Disseldorp [Tue, 5 Jul 2011 13:04:02 +0000 (15:04 +0200)]
s3-printing: remove tdb migration invalid printer name checks
WERR_INVALID_PRINTER_NAME only needed to be handled when printing tdb
migration used spoolss, with winreg such errors are no longer possible.
Signed-off-by: Günther Deschner <gd@samba.org>
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Jul 7 19:15:34 CEST 2011 on sn-devel-104
(cherry picked from commit
e5955903fdc5ed6f8660b72db0716d4da25c711c)
(cherry picked from commit
1822df19e764bce37a4b2c7e212a2bb0c61d1d13)
David Disseldorp [Tue, 5 Jul 2011 09:34:47 +0000 (11:34 +0200)]
s3-printing: fill info2_mask in printer migration
Also fix possibly uninitialised status return from
printing_tdb_migrate_printer().
(cherry picked from commit
5dd8185d852afc3843253c9471326677f8816a77)
(cherry picked from commit
ec0c13d05962e0e3d92dee811667e2dc6bfa67fc)
Günther Deschner [Tue, 5 Jul 2011 12:01:40 +0000 (14:01 +0200)]
s3-printing: make sure to first migrate the printers then the security descriptor.
Guenther
Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit
cfc3b6e5f79f253e83dfbd13d47b671deb5801b3)
(cherry picked from commit
d967d1b9ac902cd750cc9c43ecce9481c444504b)
Günther Deschner [Tue, 5 Jul 2011 00:33:23 +0000 (02:33 +0200)]
s3-printing: remove spoolss pipe from migration library, only using winreg finally.
Guenther
Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit
57bbb32c64db1027e2b9ae1aef7f5f3b33ae3882)
(cherry picked from commit
4fc35a5cc9db162a6df7b09e70686caaaa6c352c)
Günther Deschner [Mon, 4 Jul 2011 17:47:07 +0000 (19:47 +0200)]
s3-printing: use winreg interface for migration, instead of spoolss.
Guenther
Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit
8f3d5f5333a61922c4ea7ff1e1d244978958e857)
Conflicts:
source3/printing/nt_printing_migrate.c
(cherry picked from commit
8ca35cd86041d197f3bf377cc0afabe5e2cd4ceb)
Günther Deschner [Mon, 4 Jul 2011 22:55:35 +0000 (00:55 +0200)]
s3-printing: safe a ton of roundtrips by reusing existing winreg binding_handles.
Guenther
Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit
72b1f8be5619ed778c4aa0b967f6a4f34d7e9de8)
Conflicts:
source3/rpc_server/spoolss/srv_spoolss_nt.c
(cherry picked from commit
5bab2244e5893ae6f470299b4efcabd54dc23fcc)
Günther Deschner [Mon, 4 Jul 2011 22:16:03 +0000 (00:16 +0200)]
s3-printing: use winreg_internal functions.
Guenther
Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit
0a1ec73b965f66977a90fb7febb3b56b52ebab20)
Conflicts:
source3/rpc_server/spoolss/srv_spoolss_nt.c
(cherry picked from commit
7c0ab14cc21c47193e7198a01e5ae16052c8d0f9)
Günther Deschner [Mon, 4 Jul 2011 22:16:47 +0000 (00:16 +0200)]
s3-printing: add winreg_internal functions.
Guenther
Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit
ada5380d2090179fc57eee66e2b46788f4944db0)
Conflicts:
source3/rpc_server/spoolss/srv_spoolss_nt.c
source3/rpc_server/spoolss/srv_spoolss_util.c
(cherry picked from commit
77ccfc6f41ca615911d49039046502fcf8e23cee)
Günther Deschner [Mon, 4 Jul 2011 18:09:54 +0000 (20:09 +0200)]
s3-printing: add winreg_printer_binding_handle and remove most of srv_spoolss_util.c.
Guenther
Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit
a762eda519c995214c041170e2615c5c51b2a2b1)
Conflicts:
source3/rpc_server/spoolss/srv_spoolss_util.c
(cherry picked from commit
6bc840366b9c421f742467ef337c8703a8d365ea)
Günther Deschner [Mon, 4 Jul 2011 17:47:29 +0000 (19:47 +0200)]
s3-printing: add rpc_client/cli_winreg_spoolss.c
Guenther
Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit
f2be8378b92669092f8444df038f769fc9312ff4)
(cherry picked from commit
3c29f9b015809840aaf4de75186536f6f5e91bd9)
Günther Deschner [Tue, 5 Jul 2011 09:29:37 +0000 (11:29 +0200)]
s3-waf: make LIBCLI_SPOOLSS a shared library
Guenther
Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit
a0fc64a88ee6f1f45d4c2b95d6773eccab50ebb4)
(cherry picked from commit
d53dbd8e66b45195c4879a4bb1b9a659b4bf4f99)
Günther Deschner [Tue, 5 Jul 2011 00:15:35 +0000 (02:15 +0200)]
s3-printing: move spoolss_create_default_devmode/secdesc to init_spoolss.h
Guenther
Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit
43cf3a28dc539351da8a316e0e52a8292ec40cc7)
(cherry picked from commit
dd21eaa11c919935f959941aefbba454a272119b)
Günther Deschner [Tue, 5 Jul 2011 00:12:24 +0000 (02:12 +0200)]
s3-printing: move driver_info_ctr_to_info8 to init_spoolss.h
Guenther
Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit
74e416031b2fc5d9c6af30f692d5b73cb1942cf4)
(cherry picked from commit
2e86c3ffac47bdb43ddc0012d96bd4d489658774)
Günther Deschner [Mon, 4 Jul 2011 23:24:48 +0000 (01:24 +0200)]
s3-printing: move os2 related functions to printing/nt_printing_os2.c.
Guenther
Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit
dd5375b4a1798c856fa9c104baa36c137d664b9d)
Conflicts:
source3/rpc_server/spoolss/srv_spoolss_util.c
(cherry picked from commit
b039a965488aba0e8d31abe0a389e6ddef99d8b9)
Günther Deschner [Fri, 1 Jul 2011 13:39:11 +0000 (15:39 +0200)]
s3-printing: open up a winreg pipe handle for the migration code.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Mon Jul 4 15:06:41 CEST 2011 on sn-devel-104
(cherry picked from commit
ff94539f276bdef73bd12c67bff1f34e697ccbfc)
(cherry picked from commit
b1aca06b1823601a5942ead53ed66ca95bd3b8c4)
Günther Deschner [Fri, 1 Jul 2011 13:02:26 +0000 (15:02 +0200)]
s3-net: use printing_migrate library, and eliminate duplicate code.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Jul 1 17:57:09 CEST 2011 on sn-devel-104
(cherry picked from commit
bafd7212eb4c82e86874b2f80ddf5c04b2d180b9)
Conflicts:
source3/utils/net_printing.c
(cherry picked from commit
35de817734fec9dcb0197c20b9c308df2ac7dccc)
Günther Deschner [Fri, 1 Jul 2011 12:57:32 +0000 (14:57 +0200)]
s3-printing: split out printing migration code into a smaller library.
Guenther
(cherry picked from commit
e02abd6c83708f297b1985bb1bdc7d5dfbc924b2)
Conflicts:
source3/printing/nt_printing_migrate.c
source3/wscript_build
(cherry picked from commit
cb1368f19148b30c515f0632fdeb32ef127fa0c7)
David Disseldorp [Wed, 15 Jun 2011 12:59:49 +0000 (14:59 +0200)]
s3-printing: skip migration of non-existent printers
Skip tdb migration of printer and security descriptor entries which
refer to non-existent printers.
Signed-off-by: Günther Deschner <gd@samba.org>
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Jun 30 10:54:23 CEST 2011 on sn-devel-104
(cherry picked from commit
c9e3f6ab02bdc354a9b656f62744ee66fe9e9e67)
(cherry picked from commit
d24c4ef87ff02975cdb024e01b067107c60050cc)
David Disseldorp [Wed, 15 Jun 2011 10:46:55 +0000 (12:46 +0200)]
s3-printing: fill devicemode size in migrate_printer()
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
a36ce0735ff6cad8124bd63a056a71d9495b238c)
(cherry picked from commit
8245acab26a83a006d04626f15d5a47dcb71053e)
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)
(cherry picked from commit
f1196b1edc30549d36cc1d8a66541d79a65f31ce)
Karolin Seeger [Tue, 5 Jul 2011 18:39:53 +0000 (20:39 +0200)]
WHATSNEW: Add changes since rc2.
Karolin
(cherry picked from commit
75785ccbf6d7f633837ae65b2deac0c9bf8cd858)
Christian Ambach [Mon, 4 Jul 2011 15:55:54 +0000 (17:55 +0200)]
s3:smb2 fix smbd crash on premature end of smb2 conn (Bug 8286)
when smbd tries to clean up locks after a premature end of a smb2
connection, lock_db has already been freed and so it crashes
this patch changes the order in which items are freed so that
lock_db is still around when it is needed
(cherry picked from commit
2c94ff10332f4be909a158329c41e2f5db035949)
Stefan Metzmacher [Thu, 30 Jun 2011 08:09:56 +0000 (10:09 +0200)]
s3:nmbd_subnetdb: close all sockets attached to a subnet in close_subnet() (bug #8276)
metze
(cherry picked from commit
75e9f2110876137a57632d223248ac51dbfc4569)
(cherry picked from commit
1c8690c82905ff55ed9eafd02df295edf79e7943)
Gregor Beck [Tue, 21 Jun 2011 06:16:56 +0000 (08:16 +0200)]
s3:smbldap: make smbldap_connect_system self contained
The last patches address bug #8253 (winbindd panics if verify_idpool() fails).
(cherry picked from commit
c6d5c7cc830d59e7b6f0fa5a38eae27b0f1aa4bb)
Gregor Beck [Tue, 21 Jun 2011 06:06:28 +0000 (08:06 +0200)]
s3:smbldap: add a destructor to smbldap_state, just in case
(cherry picked from commit
56bc5c73eaa7509d4e58ed010c834304b238c72c)
Gregor Beck [Tue, 21 Jun 2011 06:02:53 +0000 (08:02 +0200)]
s3:smbldap: let smbldap_free_struct do what it claims to
(cherry picked from commit
66e853875ec13481093bf79522004665fe66260d)
Gregor Beck [Tue, 21 Jun 2011 06:00:59 +0000 (08:00 +0200)]
s3:smbldap: free the idle event scheduled in smbldap_open in smbldap_close
(cherry picked from commit
56e9ad4aa736875ac5666a9c3e33ae3d94fb2f5c)
Gregor Beck [Tue, 21 Jun 2011 05:51:41 +0000 (07:51 +0200)]
s3:smbldap: use smbldap_state as memory context for idle event
ensure the event is canceled if the smbldap_state gets freed
this fixes a panic of winbindd if verify_idpool fails
(cherry picked from commit
119a45e9f8e4fdc17417a1b618094e3280add584)
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)
(cherry picked from commit
e282a816d45b750293c14fbd6de4569f7270107a)
Michael Adam [Thu, 30 Jun 2011 13:15:22 +0000 (15:15 +0200)]
s3:build: add vfs_examples to the everything target
So that one can not pass autobuild without keeping the vfs examples intact.
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Thu Jun 30 16:52:48 CEST 2011 on sn-devel-104
The last 5 patches address bug #8281 (examples/VFS/* does not build).
(cherry picked from commit
f28ec1da9e51d53f4e93a23088a7c7c4ab2c109f)
Michael Adam [Thu, 30 Jun 2011 11:54:52 +0000 (13:54 +0200)]
s3:build: add a vfs_examples target.
(cherry picked from commit
737a1c9b96a4ba8d8688f4dba1df6d931e10e64d)
Björn Baumbach [Wed, 29 Jun 2011 14:57:27 +0000 (16:57 +0200)]
examples/VFS: fix skel_transparent.c in reference to shadow_copy changes
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit
d57a51093e526d7aac05f3d210ab7aee5e2036aa)
Björn Baumbach [Wed, 29 Jun 2011 14:56:45 +0000 (16:56 +0200)]
examples/VFS: fix skel_opaque.c in reference to shadow_copy changes
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit
180749b898c4491e04c2a11d4b39b2833e3602e6)
Björn Baumbach [Wed, 29 Jun 2011 14:53:57 +0000 (16:53 +0200)]
examples/VFS: fix shadow_copy_test.c in reference to shadow_copy changes
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit
e21d132cc98abe03247f91b27b098ec83b8d08e2)
Günther Deschner [Tue, 28 Jun 2011 21:59:11 +0000 (23:59 +0200)]
s3-winbind: Fix bug 7888 -- deal with buggy 3.0 based PDCs
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Jun 30 00:42:23 CEST 2011 on sn-devel-104
(cherry picked from commit
97055cee026b4f1b0e2730786a94390f6515593e)
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.
Metze please review.
(cherry picked from commit
4b094c2acdfe93fdce80adc6dc3df73cf2d3fae1)
Jeremy Allison [Wed, 29 Jun 2011 00:45:49 +0000 (17:45 -0700)]
Fix bug #8219 - SMB Panic from Windows 7 Client
Caused by referencing an uninitialized variable in the
duplicated struct smbd_smb2_request when sending a signed
intermediate reply.
(cherry picked from commit
501969a2b95b15fd9f8602b14a391e5096b17183)
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)
(cherry picked from commit
44cfdd92e73d9ecb68b5a0ee1167f9e64c2aebeb)
Stefan Metzmacher [Thu, 16 Jun 2011 10:47:22 +0000 (12:47 +0200)]
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).
(cherry picked from commit
355ffd89e54dea15bf94b93f59c321109e951cad)
Stefan Metzmacher [Thu, 16 Jun 2011 10:34:42 +0000 (12:34 +0200)]
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.
metze
(cherry picked from commit
11683ccf3e68606ecb1cdfa455f7921b119803c6)
(cherry picked from commit
04b62ec0168e84c00fd08f0695b94ec5ca80ba88)
Stefan Metzmacher [Thu, 16 Jun 2011 06:33:09 +0000 (08:33 +0200)]
s3:rpc_server/svcctl: don't allocate return values on a temporary stackframe
And always initialize the whole return structure.
This caused samba3.posix_s3.rpc.svcctl to be flakey.
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Jun 16 11:34:34 CEST 2011 on sn-devel-104
(cherry picked from commit
48de3e51eacbd1051f79dc99aaac8a4ec988fde5)
(cherry picked from commit
7008fc0028993e98b335cf8533481073a5bd82df)
Jeremy Allison [Thu, 23 Jun 2011 22:06:16 +0000 (15:06 -0700)]
Fix bug #8254 - "acl check permissions = no" does not work in all cases
Move lp_acl_check_permissions() into can_delete_file_in_directory()
where it makes sense. Remove ACL check when requesting DELETE_ACCESS
when lp_acl_check_permissions is false.
Thanks to John Janosik @ IBM for noticing this.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Jun 24 01:18:11 CEST 2011 on sn-devel-104
(cherry picked from commit
863548647dabca2c9706fbc48b4ae72277fc8c11)
Michael Adam [Fri, 24 Jun 2011 14:40:17 +0000 (16:40 +0200)]
s3:test: don't rely on pyhton being in /usr/bin/python in the sids2xids test
"/usr/bin/env pyhton" should always work as long as pyhton is in the path.
(cherry picked from commit
d8d18fa66464b780818807a4fb50bf458158714a)
Michael Adam [Fri, 24 Jun 2011 14:38:07 +0000 (16:38 +0200)]
s3:test: fix the smbclient_s3 test on older systems
mktemp requires precisely six Xs at the end of the template name
(cherry picked from commit
0892313b4b1bdcab671e18db58d7758fe87a0efd)
Michael Adam [Fri, 24 Jun 2011 14:37:20 +0000 (16:37 +0200)]
s3:test: fix the net registry roundtrip test on older systems
mktemp requires exactly Xs at the end of the template name on SLES8
(cherry picked from commit
aa2dd250abd392b9ce77d35af7d3f4827326559b)
Andrew Bartlett [Tue, 14 Jun 2011 05:00:32 +0000 (15:00 +1000)]
s3-autconf Move nmbd socket directory to PREFIX/var/nmbd
This is consistent with the new ncalrpc socket directory, also added
in this release.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
The last 2 patches address bug #8230 (Move .nmbd socket directory to non-hidden
name PREFIX/var/nmbd).
(cherry picked from commit
833fdb5b3693a7c9111bb98e5bc9a29d29be9d1d)
Andrew Bartlett [Tue, 14 Jun 2011 04:56:30 +0000 (14:56 +1000)]
s3-buildoptions Show compiled-in location of the new ncaclrpc and nmbd sockets
(cherry picked from commit
c558775713e505cfc1db5af417cc7b792dfc310e)
Michael Adam [Tue, 7 Jun 2011 13:21:34 +0000 (15:21 +0200)]
s3:docs: fix the example in the idmap_autorid manpage to use "idmap config * : rangesize"
(cherry picked from commit
a2fa00e4ea6f3a99953f4ec3214d68a07223b910)
Björn Jacke [Fri, 24 Jun 2011 11:37:16 +0000 (13:37 +0200)]
s3:vfs_commit: fix build
fix build
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Fri Jun 24 14:51:31 CEST 2011 on sn-devel-104
(cherry picked from commit
d4ea319e7ad9ee2fc2fad0c016845f820681569a)
Fix bug #8262 (vfs_commit doesn't compile).
(cherry picked from commit
45a6fa93c79ea7ec378dbdb1d9c6da019dc0545a)
Stefan Metzmacher [Fri, 24 Jun 2011 06:54:02 +0000 (08:54 +0200)]
s3:smb2_ioctl/FSCTL_PIPE_TRANSCEIVE: generate STATUS_BUFFER_OVERFLOW if needed (bug #8260)
This should fix DCERPC responses with fragments larger than 1024 bytes.
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Jun 24 11:25:36 CEST 2011 on sn-devel-104
(cherry picked from commit
2bb325ad913c1cff88faab55102cef75d14c04a6)
(cherry picked from commit
093ba63588022e3f9df81edc3393ef552e0f9825)
Christian Ambach [Fri, 17 Jun 2011 19:54:30 +0000 (21:54 +0200)]
s3:modules fix Bug 8244 - Cannot copy files larger than 2 GB to Samba share
the time_audit module uses int instead of uint64 as return value
in get_alloc_size so that sizes of files larger than 2 GB are
cut of leading to wrong replies to NtCreateAndX and Windows
clients giving up
While checking the types of all functions, I found two more wrong
return value types that needed correction
Autobuild-User: Christian Ambach <ambi@samba.org>
Autobuild-Date: Fri Jun 17 23:11:10 CEST 2011 on sn-devel-104
(cherry picked from commit
bb66504dadf56366ea30697ae73673de3df08132)
(cherry picked from commit
11008f1c73afdd86e7fa929fe37675c57ae2c32c)
Volker Lendecke [Sun, 19 Jun 2011 17:23:47 +0000 (19:23 +0200)]
s3: Fix Coverity ID 2582: FORWARD_NULL
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Sun Jun 19 20:46:43 CEST 2011 on sn-devel-104
(cherry picked from commit
5290faca7a5ae5f3f0309a42586768a5c93bfb9d)
Fix bug #8247 (SMB2 shadow copy can be crashed remotely).
(cherry picked from commit
8a7a3c6704d8f2c48c8fbc2ad1bddb5b67131b4c)
Andreas Schneider [Mon, 20 Jun 2011 17:27:01 +0000 (19:27 +0200)]
s3-spoolss: Fix some valgrind warnings.
These are in/out values and need to be initialized.
The last 2 patches address bug #8240 (valgrind warnings in winreg/spoolss
code).
(cherry picked from commit
229c7246823f3c156d065546b526f11d1298210e)
Andreas Schneider [Mon, 20 Jun 2011 13:39:36 +0000 (15:39 +0200)]
s3-rpc_client: Fix some valgrind warnings.
These are in/out values and need to be initialized.
(cherry picked from commit
7bf1418e9cfe313ee4873853d2ee41ca344f8ee0)
Michael Adam [Thu, 9 Jun 2011 22:50:42 +0000 (00:50 +0200)]
s3:idmap_autorid: remove redundant code
The last 4 patches address bug #8213 (Fixes in idmap_autorid).
(cherry picked from commit
a1a1a58101319034ea437544313591cb0fd7e7f3)
Michael Adam [Thu, 9 Jun 2011 22:49:37 +0000 (00:49 +0200)]
s3:idmap_autorid: in initialize, don't leak storedconfig to talloc_tos() in the success case
(cherry picked from commit
496e472894c3fbd543fac88c0c2d304116d64ff8)
Michael Adam [Thu, 9 Jun 2011 22:46:19 +0000 (00:46 +0200)]
s3:idmap_autorid: use "idmap config * : rangesize" instead of "autorid : rangesize"
(cherry picked from commit
ea0b87a6e9857c27383ae3fac2c37c61427d31fc)