Michael Adam [Mon, 7 Dec 2009 13:27:28 +0000 (14:27 +0100)]
packaging(RHEL-CTDB): clean some commented out lines from the files sections
Michael
(cherry picked from commit
a18692ddcffbe3faf1abc50091c9481e53e8c801)
Michael Adam [Mon, 7 Dec 2009 13:26:03 +0000 (14:26 +0100)]
packaging(RHEL-CTDB): explicitly list library versions in samba-winbind-32bit
Michael
(cherry picked from commit
0cc9a21c6f352765c1a3760d5f8eebd4dc6f8b8e)
Michael Adam [Mon, 7 Dec 2009 13:25:32 +0000 (14:25 +0100)]
packaging(RHEL-CTDB): explicitly list library versions in samba-common
Michael
(cherry picked from commit
a135a15a2bb5c56089715b842754c34b3ba9d55e)
Michael Adam [Mon, 7 Dec 2009 13:20:24 +0000 (14:20 +0100)]
packaging(RHEL-CTDB): explicitly list all packaged idmap/nss-info/charset modules
in the samba-common package.
This is to better be able to catch regressions or
build problems.
Michael
(cherry picked from commit
ae0e6ab4c7bfd1547f0b0252a66523b9ab47f9c7)
Michael Adam [Mon, 7 Dec 2009 13:16:15 +0000 (14:16 +0100)]
packaging(RHEL-CTDB): explicitly list all the vfs modules in the main package
Instead of the wildcard list, to better control regressions or
build problems.
Michael
(cherry picked from commit
d420b308c1640d96fd9d2b8fe2b4b8ac5071b38d)
Michael Adam [Mon, 7 Dec 2009 13:12:05 +0000 (14:12 +0100)]
packaging(RHEL-CTDB): add some checks to test the built smbd
Test whether some required features have been built into smbd.
Can be extended...
Michael
(cherry picked from commit
c6435cd8b36320b27a2a9940380daa776536e3e6)
Michael Adam [Mon, 7 Dec 2009 13:11:32 +0000 (14:11 +0100)]
packaging(RHEL-CTDB): make everything instead of all in the build stage
Michael
(cherry picked from commit
1aec01077944b6a2762624895bac42333ca36963)
Jeremy Allison [Mon, 7 Dec 2009 22:41:09 +0000 (14:41 -0800)]
parent_sd can never be null in this function, so don't
check for it.
Jeremy.
(cherry picked from commit
a24631007ea4dcf25e777070d783608f988a5f94)
(cherry picked from commit
eea09855f381d435b76298069b67e2d331b41f8c)
Jeremy Allison [Mon, 7 Dec 2009 22:36:12 +0000 (14:36 -0800)]
Hopefullt final fix for 6802 - acl_xattr.c module: A created folder does not properly inherit permissions from parent and 6938 - No hook exists to check creation rights when using acl_xattr module
Volker was right (dammit :-). It's much easier to catch
this case in the create_file() vfs call instead of trying
to do everything inside open() and mkdir(). Hook all these
functions to gain the desired effect.
Jeremy.
(cherry picked from commit
12bac42a93cd6afd3cd29460b97bbd61852a9d44)
(cherry picked from commit
aab1e424db3134db2d78553d51859dc79d1a8831)
Stefan Metzmacher [Fri, 4 Dec 2009 15:46:34 +0000 (16:46 +0100)]
s3: let gencache_init() use tdb_check()
If the check fails we try to clear the tdb and start
with an empty cache.
metze
(cherry picked from commit
909cd2617fa1c170183664af1fc4253af2dc2f21)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit
1a17c8ffe0f17138e45b57a82d5b4a3c73628bca)
Stefan Metzmacher [Fri, 4 Dec 2009 15:34:08 +0000 (16:34 +0100)]
s3: let netsamlogon_cache_init() use tdb_check()
If the check fails we try to unlink the old file and
start with an empty cache.
metze
(cherry picked from commit
8f19c08072a7a6036d59cf6c2ca6ce17c74b7635)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit
8f737c3cd154f394f821b0e34ced3f84ff8773c4)
Stefan Metzmacher [Fri, 4 Dec 2009 15:32:42 +0000 (16:32 +0100)]
s3: let tdb_validate_child() use tdb_check()
metze
(cherry picked from commit
6f6608c2aa6122c87ea1e8a937708d08e6c5785e)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit
66847adf072606e6519a1de1ede3aa26d9e041ba)
Stefan Metzmacher [Fri, 4 Dec 2009 15:59:39 +0000 (16:59 +0100)]
s3: require tdb 1.1.7 with tdb_check()
metze
(cherry picked from commit
886fe5b92082c2d18f97ff0bdcced52d38f344ca)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit
7a16b95703bf063b2c02133c97a06f7ab0e85963)
Karolin Seeger [Mon, 7 Dec 2009 15:28:30 +0000 (16:28 +0100)]
s3:docs: Document "directory name cache size".
Karolin
(cherry picked from commit
5055ba140d03189a3c8181d57ad920e68c6e387c)
(cherry picked from commit
a9077c77b7119fb15cbc74d9b160a363932b0bde)
Volker Lendecke [Mon, 7 Dec 2009 15:24:08 +0000 (16:24 +0100)]
s3: de-deprecate "write cache size" to prevent its removal without a proper alternative
(cherry picked from commit
950857f6ba7f0ff4e238b600fc0e6c10c972e582)
Karolin Seeger [Mon, 7 Dec 2009 15:06:29 +0000 (16:06 +0100)]
create-tarball: Readd RFCs (fixes the merged build).
See http://lists.samba.org/archive/samba-technical/2009-December/068235.html
for more information.
Karolin
(cherry picked from commit
08b692828ed6a9929dc6098fabc8aa47a0e32f93)
Günther Deschner [Mon, 7 Dec 2009 13:38:24 +0000 (14:38 +0100)]
s4-smbtorture: disable some spoolss printerdata tests which s3 does not pass at the moment.
Guenther
(cherry picked from commit
8de6f7178c220d0a529ed91f87760e8d172448d2)
(cherry picked from commit
5dde3686d951db49ae6a06a31dc43fd5c0d3162f)
Günther Deschner [Mon, 7 Dec 2009 10:54:26 +0000 (11:54 +0100)]
s3: fix net and rpcclient after setprinterdataex changes.
Guenther
(cherry picked from commit
c85ed0054e67413ffcd169c405ee4feda3555628)
(cherry picked from commit
3f3c04e963d5532340b306ea4e875df2b03985d4)
Günther Deschner [Fri, 4 Dec 2009 23:58:45 +0000 (00:58 +0100)]
s4-smbtorture: fix RPC-SPOOLSS after _spoolss_SetPrinterDataEx IDL change.
Guenther
(cherry picked from commit
123d8d1c2c8ea214fa1a216c92ca1a3fc1b4d6d0)
(cherry picked from commit
f67637b63dce30b07fc95bd80ace36c9defbbb23)
Günther Deschner [Mon, 7 Dec 2009 10:28:56 +0000 (11:28 +0100)]
s3-spoolss: let _spoolss_DeletePrinterData call into _spoolss_DeletePrinterDataEx.
Guenther
(cherry picked from commit
ef9d6580efc55ee040458b7cd76ebdc2e1276e98)
(cherry picked from commit
50df20e01590533dbd086393ddf95835db2b71ac)
Günther Deschner [Fri, 4 Dec 2009 23:56:55 +0000 (00:56 +0100)]
s3-spoolss: let _spoolss_SetPrinterData call into _spoolss_SetPrinterDataEx.
Guenther
(cherry picked from commit
167dca0cbf18baf40dd923f6f92421123d34b5a3)
(cherry picked from commit
a987a9f33a9acba97764d1b43c106727ff653da3)
Günther Deschner [Fri, 4 Dec 2009 23:52:28 +0000 (00:52 +0100)]
s3-spoolss: let _spoolss_GetPrinterData call into _spoolss_GetPrinterDataEx.
Guenther
(cherry picked from commit
778124ea32ecc9d2404ef6abd8af9d14e6320f3a)
(cherry picked from commit
41232506678c06b64f193a0fae76b2bca862bd3f)
Günther Deschner [Fri, 4 Dec 2009 23:50:18 +0000 (00:50 +0100)]
spoolss: rework spoolss_GetPrinterDataEx and spoolss_SetPrinterDataEx.
Guenther
(cherry picked from commit
08823166a13d5ec3027b0c5a0db5e684b8e3c3b6)
(cherry picked from commit
b35133dcc618e169045e078c53873bf0694f74f0)
Günther Deschner [Fri, 4 Dec 2009 16:22:25 +0000 (17:22 +0100)]
s3-spoolss: a default printer should have at least a "PrintDriverData" key.
Guenther
(cherry picked from commit
a367b2b5df30b92ccacc4fc15c07c1fd955c7d5b)
(cherry picked from commit
8af757fe7c95ffba02d00d010fa5360943724574)
Günther Deschner [Fri, 4 Dec 2009 12:33:49 +0000 (13:33 +0100)]
s3-winreg: fill in some inline comments.
Guenther
(cherry picked from commit
1bc83b984d6f074a5a7c7d3e7f6de4a2278fee4c)
(cherry picked from commit
7c646c39d7b05fa3c98edf012bca0e8057e70d57)
Günther Deschner [Fri, 4 Dec 2009 12:29:08 +0000 (13:29 +0100)]
s3-winreg: remove trailing whitespace.
Guenther
(cherry picked from commit
5d46530053fa7728d1d4903a3d92f238202ab0d8)
(cherry picked from commit
d9717f661ed06e833ba895831f59424476ed4831)
Günther Deschner [Fri, 4 Dec 2009 01:54:33 +0000 (02:54 +0100)]
s4-smbtorture: heavily expand printerdata tests in RPC-SPOOLSS.
Including new tests for:
- spoolss_SetPrinterDataEx
- spoolss_DeletePrinterDataEx
- spoolss_DeletePrinterKey
Guenther
(cherry picked from commit
02fe8630395879ffa761d75c7d7b75fc7cda5e4c)
(cherry picked from commit
32bec5e5f09eec603b4fc366707bbd320dc804a3)
Günther Deschner [Thu, 3 Dec 2009 22:23:36 +0000 (23:23 +0100)]
s3-spoolss: handle SEC_FLAG_MAXIMUM_ALLOWED in spoolss_OpenPrinterEx.
In case someone (smbtorture4) requests SEC_FLAG_MAXIMUM_ALLOWED, translate it
to a request of PRINTER_ACCESS_ADMINISTER.
Guenther
(cherry picked from commit
459a968fb4d6f96ea7f310f331d3547e2e466d6a)
(cherry picked from commit
e96c22d8d16a520c2ee9f49f71c26d1cb86f148f)
Günther Deschner [Thu, 3 Dec 2009 21:38:38 +0000 (22:38 +0100)]
s4-smbtorture: check more WERRORs in RPC-SPOOLSS.
Guenther
(cherry picked from commit
2f0548fd98ccbe9695d4e6ae0e21e5ceca76ac68)
(cherry picked from commit
cfd570a0128db42429a48ab6001f20d99d8dbfeb)
Günther Deschner [Thu, 3 Dec 2009 21:05:35 +0000 (22:05 +0100)]
s4-smbtorture: call test_EnumPrinterDrivers with architecture in RPC-SPOOLSS.
Guenther
(cherry picked from commit
4e20a6f83b981ae0948ce1b9ec0a39162b38b512)
(cherry picked from commit
3f0de03ca9d6e075e10943d9e511134231809b16)
Karolin Seeger [Mon, 7 Dec 2009 13:38:18 +0000 (14:38 +0100)]
s3:auth: Fix typo in debug message.
Karolin
(cherry picked from commit
71018ebe5303ca6e0f3e3e4b96ae45fb32d3e195)
(cherry picked from commit
626ae39f3952087e05cbcd42a049119860072bc8)
Karolin Seeger [Mon, 7 Dec 2009 09:15:49 +0000 (10:15 +0100)]
examples: Fix the build of the example VFS modules.
Karolin
(cherry picked from commit
fe01e0e1a5a07ddefdc09f24d44c7e66886405b8)
(cherry picked from commit
cef50766b3e622c12890811cd048ba4cec36bb96)
Christian Ambach [Wed, 2 Dec 2009 19:06:37 +0000 (20:06 +0100)]
streamline some log levels for invalid servicenames
I don't think we need to log the fact that a user gave a wrong sharename in Explorer with the highest log level.
The level of this was not very consistent:
service.c: DEBUG(3,("find_service() failed to find service %s\n", service));
service.c: DEBUG(0,("%s (%s) couldn't find service %s\n",
smb2_tcon.c: DEBUG(1,("smbd_smb2_tree_connect: couldn't find service %s\n",
This changes the last two to 3 as the first one.
Signed-off-by: Christian Ambach <christian.ambach@de.ibm.com>
(cherry picked from commit
1ae8145c66bcfc79ce5e554a057b410339868b8f)
Volker Lendecke [Sun, 6 Dec 2009 11:50:51 +0000 (12:50 +0100)]
s3: Fix a const discard warning
(cherry picked from commit
d8a40f1227132d49051ddbc2bb9727ee3956d86c)
Volker Lendecke [Sun, 6 Dec 2009 11:50:25 +0000 (12:50 +0100)]
s3: talloc_array_length deals file with a NULL argument
(cherry picked from commit
0249e477edee01ba4185db8ffada537e8bae8e79)
Volker Lendecke [Sun, 6 Dec 2009 11:49:46 +0000 (12:49 +0100)]
s3: Small simplification: qsort deals fine with just one entry
(cherry picked from commit
3c5e571a2f1b6d32b735e26949b9739fc960c22b)
Volker Lendecke [Sun, 6 Dec 2009 11:49:09 +0000 (12:49 +0100)]
s3: Simplify usr_info_cmp by calling timeval_compare()
(cherry picked from commit
4b3ad2547c452dd9493fe63e056346a5f7561a37)
Volker Lendecke [Sun, 6 Dec 2009 11:40:44 +0000 (12:40 +0100)]
s3: Add rpcclient wkssvc_enumerateusers
(cherry picked from commit
d8c52227224771cbe55a469eec7530f91dc18e26)
Ian Puleston [Sun, 22 Nov 2009 23:00:00 +0000 (00:00 +0100)]
s3: Complete support for NetWkstaGetInfo/NetWkstaEnumUsers
(cherry picked from commit
381cf92adb3710d350e39f4a5cd72265a67e3b0a)
Volker Lendecke [Mon, 3 Aug 2009 15:27:11 +0000 (17:27 +0200)]
s3: First cut at _wkssvc_NetWkstaEnumUsers
This needs access checks!
(cherry picked from commit
34fc32b9a71334217e4661525ed466d5d57642d2)
Volker Lendecke [Mon, 3 Aug 2009 14:52:01 +0000 (16:52 +0200)]
s3: Support NetWkstaGetInfo 101 and 102
(cherry picked from commit
7ead9dd7e8eece7b09d33fdc2ed0f83da0b41e7d)
Michael Adam [Fri, 4 Dec 2009 22:29:22 +0000 (23:29 +0100)]
packaging(RHEL-CTDB): package dbwrap_tool and dbwrap_torture in the common pkg
Michael
(cherry picked from commit
ef33b60d1a22d7200c3047ca817cd78f3f9dea07)
Michael Adam [Fri, 4 Dec 2009 13:53:05 +0000 (14:53 +0100)]
s3:dbwrap_ctdb: increase the number of commit retries 5-->100
This is to cope with timeouts when recoveries and transactions collide.
Maybe 100 is too hight, but 10 or even 20 have been too low in a
very busy environment.
Michael
(cherry picked from commit
97eb53b432e8b16e55b0dccac7acbb2e40467dc6)
Michael Adam [Fri, 4 Dec 2009 13:49:53 +0000 (14:49 +0100)]
s3:dbwrap_ctdb: increase the rsn of the __transaction_lock__ when storing
so that it is correctly handled by recoveries.
Also set the dmaster explicitly.
Michael
(cherry picked from commit
8e4f774bff9926567006cdc263fa76fd8b703b63)
Volker Lendecke [Sat, 5 Dec 2009 13:27:04 +0000 (14:27 +0100)]
s3: Fix explicit stat64 support
(cherry picked from commit
c81f6e519e1f976fce0896fa7b9e29c412411e13)
Jeremy Allison [Fri, 4 Dec 2009 22:04:08 +0000 (14:04 -0800)]
Make Samba3 pass the RAW-LOCK test as Windows.
Implement the win7 NT_STATUS_INVALID_LOCK_RANGE.
Make smbd behave as Windows does in canceling locks.
Jeremy.
(cherry picked from commit
32915ceefc718621e2e9b17fee97da82744ab67a)
(cherry picked from commit
3ec654de706f4bd2576245333cc98105388a3c10)
Jim McDonough [Fri, 4 Dec 2009 17:31:53 +0000 (12:31 -0500)]
s3: bug #6967: Prevent glibc error on net ads join:
talloc()ed memory should not be SAFE_FREE()ed.
Signed-off-by: Jim McDonough <jmcd@samba.org>
(cherry picked from commit
242d1179f92666e7548cb2f26695a0306e20d64c)
Kai Blin [Fri, 4 Dec 2009 08:47:25 +0000 (09:47 +0100)]
s3 aclocal.m4: Fix iconv checks, clean up m4 code
The check for iconv requiring giconv.h and libgiconv as well as
the check for iconv requiring biconv.h and libbiconv were using the wrong
variable to check for previous successful test results. This caused the checks
to always fall back to libbiconv on systems where that library was available.
In the course of fixing this, I had to clean up the indentation in that piece of
code, and I also rewrote/added some comments.
Many thanks to Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp> for the initial
patch and diagnosis.
(cherry picked from commit
f5aff324cb9d965bbc75634596c3c40ffc588183)
(cherry picked from commit
217a02b4a6432b1e232fe8dd0b022bc85ab47e56)
Jeremy Allison [Fri, 4 Dec 2009 01:44:38 +0000 (17:44 -0800)]
Make sure we're not using the old smb_fname data.
Jeremy.
(cherry picked from commit
66c968778d74280bf36342e76c80b617e47ebde5)
(cherry picked from commit
d0aaff97a20adf6b4c8406f2a21d45018cf5b2cb)
Jeremy Allison [Fri, 4 Dec 2009 00:45:35 +0000 (16:45 -0800)]
Remove smb_fname duplicates that just keep the same information as in fsp->fsp_name.
Moving towards making VFS_OPEN/VFS_MKDIR/VFS_RMDIR
handle based...
Jeremy.
(cherry picked from commit
3fe7dfd1d90374a2e06e1683b8f2c702c471c833)
(cherry picked from commit
cb1f641d2b9c758cc4dc8b4edb10f27543ae7a98)
Jeremy Allison [Thu, 3 Dec 2009 21:01:10 +0000 (13:01 -0800)]
Refactor reply_rmdir to use handle based code. All
calls are now handle based. Put rmdir into close.c
and make it private.
Jeremy.
(cherry picked from commit
91e0bdd86c9c14f6b9b190db8ce6ec162ce79692)
(cherry picked from commit
b9e71c705242a02fc70bbe8db7b88fdd76179663)
Björn Jacke [Thu, 3 Dec 2009 01:32:47 +0000 (02:32 +0100)]
ѕ3: remove superfluous option check
this function is only called when strict alloc is set, no reason to check that twice.
(cherry picked from commit
f39f894ed45a3cfbbc73fe67364f18908e8260fe)
Bo Yang [Fri, 4 Dec 2009 04:53:38 +0000 (12:53 +0800)]
s3: Fix crash in winbindd;(bug#6879).
Signed-off-by: Bo Yang <boyang@samba.org>
(cherry picked from commit
cdb68bd2b61147df77b7f2de3fb4e29be07e7bd9)
(cherry picked from commit
3c4f74bbcbe7c9c7e50865adac2db70e48a2d82f)
Jeremy Allison [Thu, 3 Dec 2009 02:06:40 +0000 (18:06 -0800)]
Remove unneeded argument from can_set_delete_on_close(). Ensure
can_set_delete_on_close() is correctly called before any setting
of the disposition bit (clean up the do_unlink() call).
Jeremy.
(cherry picked from commit
dfcc4115ddc7c3bf7a69d7eb747c096cd217b8a6)
(cherry picked from commit
baa4727b243ff2dfb78d3dd5fd29c8e9a3667c56)
Günther Deschner [Wed, 2 Dec 2009 23:46:47 +0000 (00:46 +0100)]
s3-selftest: run LOCAL-NDR when running make selftest.
Guenther
(cherry picked from commit
9a3d9abdd8e9737245e3cdd7f31d453c2062dba9)
(cherry picked from commit
bd99ed71ed29012bddb815169166d7165e6167a7)
Günther Deschner [Wed, 2 Dec 2009 22:38:05 +0000 (23:38 +0100)]
s4-smbtorture: be very strict in checking spools_EnumPrinterKey results.
Guenther
(cherry picked from commit
450211b61016a4fed71eb116c1b526af0f365f13)
(cherry picked from commit
6b8158ddfdce65e32ca39d8cc2c1d7b215cd22ff)
Günther Deschner [Wed, 2 Dec 2009 20:26:10 +0000 (21:26 +0100)]
spoolss: hand-marshall the spoolss_StringArray2 struct for spoolss_EnumPrinterKey.
This call is just driving me nuts :-)
Guenther
(cherry picked from commit
f32ccc321a5467401781a0e2d4621175b6256368)
(cherry picked from commit
0005a36b14808b67a4b97376b8305bd3145ea90a)
Günther Deschner [Wed, 2 Dec 2009 13:25:31 +0000 (14:25 +0100)]
samba-spoolss: use spoolss_StringArray2 in spoolss_EnumPrinterKey.
This should finally resolve the endian issues we were seeing on sparc and is
much cleaner for spoolss clients and servers.
Guenther
(cherry picked from commit
5f60855ba2eb822dcb867378ff09278c42931b89)
(cherry picked from commit
91e9afbcd65500a37f947442955d9ca3e080982e)
Günther Deschner [Wed, 2 Dec 2009 13:22:52 +0000 (14:22 +0100)]
spoolss: add spoolss_StringArray2.
The difference to spoolss_StringArray is that in spoolss_StringArray2 the string
array is put into a subcontext of _ndr_size.
Guenther
(cherry picked from commit
292af4fc046ff39ebd3ec853c402dc267a863fa6)
(cherry picked from commit
46b5f055ffc8fbdf622482cca746e00dcfac9ca0)
Günther Deschner [Tue, 1 Dec 2009 01:38:19 +0000 (02:38 +0100)]
s3-spoolss: move MAXDEVICENAME to spoolss idl.
Guenther
(cherry picked from commit
91bb0659776d397bc4b8ca7a534f6f2327e2e6fe)
(cherry picked from commit
31217f3edaf2565947d3e79f4d655503b013bd18)
Björn Jacke [Wed, 2 Dec 2009 23:12:53 +0000 (00:12 +0100)]
s3:build: remove redundant qnx block size definition
(cherry picked from commit
4fa4e6738074d39d73acc82e04ee88c00529f6c3)
Jeremy Allison [Wed, 2 Dec 2009 23:02:28 +0000 (15:02 -0800)]
Restructure the ACL code some more, get the internal semantics
right. The previous bugs were due to the fact that get_nt_acl_internal()
could return an NTSTATUS error if there was no stored ACL blob, but
otherwise would return the underlying ACL from the filysystem. Fix
this so it always returns a valid acl if it can, and if it does not
its an error to be reported back to the client. This then changes
the inherit acl code. Previously we were trying to match Windows
by setting a minimal ACL on a new file that didn't inherit anything
from a parent directory. This is silly - the returned ACL wouldn't
match the underlying UNIX permissions. The current code will correctly
inherit from a parent if a parent has any inheritable ACE entries
that apply to the new object, but will return a mapping from the
underlying UNIX permissions if the parent has no inheritable entries.
This makes much more sense for new files/directories.
Jeremy.
(cherry picked from commit
365c6b4ce0bd84bfb1d9cec03bc835b92b1c5af7)
(cherry picked from commit
3e1afbbae79ee23c6f3b701ae3bcb57156049787)
Björn Jacke [Wed, 2 Dec 2009 14:13:37 +0000 (15:13 +0100)]
s3: prefer posix_fallocate for doing "strict allocate"
posix_fallocate is more efficient than manual zero'ing the file. When
preallocation in kernel space is supported it's extremely fast. Support for
preallocation at fs layer via posix_fallocate and fallocate at kernel site
can be found in Linux kernel 2.6.23/glibc 2.10 with ext4, XFS and OCFS2. Other
systems that I know of which support fast preallocation in kernel space are
AIX 6.1 with JFS2 and recent Solaris versions with ZFS maybe UFS2, too.
People who have a system with preallocation in kernel space might want to set
"strict allocate = yes". This reduces file fragentation and it's also safer for
setups with quota being turned on.
As of today most systems still don't have preallocation in kernel space, and
that's why "strict allocate = no" will stay the default for now.
(cherry picked from commit
a1991b17cdb38b1bffa32d2386132ae01f827cd0)
Björn Jacke [Wed, 2 Dec 2009 23:02:44 +0000 (00:02 +0100)]
s3:build: fix shared library build on QNX
Fixes #6860. Thanks to Matt Kraai!
(cherry picked from commit
7d53a5f728430013c7daca5b1301dc9271c29680)
Jeremy Allison [Wed, 2 Dec 2009 20:29:16 +0000 (12:29 -0800)]
Ensure check_parent_acl_common() only looks at stored
blobs - returns NT_STATUS_OK if there aren't any.
Jeremy.
(cherry picked from commit
148e79d156d92b41dfe7d6ae6f8cd2e571a3bee6)
(cherry picked from commit
e0904e28f43e4fc3404df85967d088b9b8b8c7d2)
Jeremy Allison [Wed, 2 Dec 2009 20:09:48 +0000 (12:09 -0800)]
Ensure get_nt_acl_internal() only looks at the ACL blobs, not
reads off the underlying filesystem. Ensure that vfs_acl_tdb.c
returns NT_STATUS_NOT_FOUND, not NT_STATUS_OBJECT_NAME_NOT_FOUND
when it can't find a blob matching the file.
Jeremy.
(cherry picked from commit
486c8d57ec5a9aa63aff275621ff45c22b8cde61)
(cherry picked from commit
f01a14846f1ab1a5589cd780aa1c6ad45d73eccf)
Jeremy Allison [Wed, 2 Dec 2009 18:01:14 +0000 (10:01 -0800)]
Fix bug #6837 - "Too many open files" when trying to access large number of files
from Windows 7. Original patch by me fixed up with the correct open files number
by jmaggard10@hotmail.com.
Jeremy.
(cherry picked from commit
b6fdecd11210a3d2ff803bdc315aacd9f8b445a1)
(cherry picked from commit
358cca77b2e09262e7e7bd41a782f46cff63922c)
Jeremy Allison [Tue, 1 Dec 2009 22:08:16 +0000 (14:08 -0800)]
Ensure we don't see the xattr used to store NT security (visible when xattr_tdb
is used). Allows make test to pass with acl_xattr.so prepended to the vfs modules.
Jeremy.
(cherry picked from commit
8dda4cea660639190c1c7e84355186d07a6e064f)
(cherry picked from commit
d09fd7e6039fad1ec2c7e1a3730ef304eab308d5)
Tim Prouty [Tue, 1 Dec 2009 18:47:08 +0000 (10:47 -0800)]
s3: Fix smbd to correctly return INVALID_LEVEL on set_file_end_of_file_info for paths
This allows smbd to pass the freshly updated RAW-SFILEINFO-END-OF-FILE
torture test.
(cherry picked from commit
ae649782df6e22c8e1922aaa03c248e5af68a036)
(cherry picked from commit
81e22afd9e4cb7b26cdb95b5dfdaf5dac877e147)
Michael Adam [Tue, 1 Dec 2009 14:22:20 +0000 (15:22 +0100)]
s3:build: fix detection of CTDB headers on systems without system-libtalloc
Michael
(cherry picked from commit
86de6647bb6f71cd43363b1be0a9f15a750024fc)
Michael Adam [Tue, 1 Dec 2009 14:03:35 +0000 (15:03 +0100)]
s3:build: fix the build when no external talloc and tdb are installed.
The check for the external libs and the addition of the include paths
to the CPPFLAGS was too late in configure.
This patch moves the whole subsystem/library section up right below
the detection of "BLDSHARED".
And it updates not only SAMBA_CPPFLAGS but also SAMBA_CONFIGURE_CPPFLAGS
so that many tests that use these flags can now succeed.
Michael
(cherry picked from commit
06618b55e3e9d17cb7802aeed4769166118af373)
Björn Jacke [Tue, 1 Dec 2009 10:48:26 +0000 (11:48 +0100)]
correct mail address
(cherry picked from commit
e1f19bc357e9df2f61c19d6f260433c91bf01665)
Lars Müller [Mon, 2 Feb 2009 20:12:52 +0000 (21:12 +0100)]
Conditional install of the cifs.upcall man page
Only install the cifs.upcall man page if CIFSUPCALL_PROGS was set while
configure.
(cherry picked from commit
789963de23d46eba41cdd29c7b50100ec47e4361)
Fix bug #6710 (cifs.upcall: Commits
e9e2414e and
64982295 are missing in 3.4.1).
(cherry picked from commit
57c99111408e38cb68a7d194bdfd31fc0864600d)
Lars Müller [Mon, 2 Feb 2009 20:38:38 +0000 (21:38 +0100)]
Adjust regex to match variable names including underscores
This is required to get the CIFSUPCALL_PROGS setting extracted from
config.log.
(cherry picked from commit
5148eefe1ea6e215dcbf4ffaa642860bd8dab45f)
(cherry picked from commit
0b83d6a1d8dfffc0e9f95c67afbeb0d7125060a1)
Jeremy Allison [Tue, 1 Dec 2009 00:56:35 +0000 (16:56 -0800)]
Fix DEBUG 0 -> DEBUG 10 (left over code).
Fix opendir status return if access denied.
Jeremy.
(cherry picked from commit
48f40793ae4190ebc9eec83924aeda9e3f16bf0d)
(cherry picked from commit
8e77a754190dfdece3b4786eaee97eab96a97c1e)
Jeremy Allison [Tue, 1 Dec 2009 00:50:34 +0000 (16:50 -0800)]
Fix bug 6938 : No hook exists to check creation rights when using acl_xattr module
Fix ACL modules to test for permissions on open/mkdir/opendir.
Ensure that underlying ACLs are returned for directories/files with
no Windows xattr or tdb acls stored.
Jeremy.
(cherry picked from commit
bdc8c9d37ca478f74127628ab03bb68cd72bff63)
(cherry picked from commit
70c4293644b623e031dc4e086c52c929faab00a9)
Günther Deschner [Mon, 30 Nov 2009 23:24:16 +0000 (00:24 +0100)]
drsuapi: fix build warning of NDR size calculation of drsuapi_DsReplicaObjectIdentifier3Binary.
The generated size actually does not include the size of the binary itself.
Guenther
(cherry picked from commit
d3339cd0c6ffa490513cc4562d2c06c218c7967e)
Günther Deschner [Mon, 30 Nov 2009 17:10:59 +0000 (18:10 +0100)]
s3-spoolss: fix fstrings in convert_devicemode() function.
Guenther
(cherry picked from commit
753b9c6d566fafee9724a84fbd91316767c1c7a2)
(cherry picked from commit
f5b13667385bbdaa0f75dd46864ad952f7a9bbfe)
Jeremy Allison [Mon, 30 Nov 2009 23:53:04 +0000 (15:53 -0800)]
Restructure the connect function code to always call
down to NEXT-> before initializing. This allows us to
do cleanup (by calling DISCONNECT) if initialization
fails. Also fix vfs_acl_xattr which was failing to
call the NEXT connect function.
Jeremy.
(cherry picked from commit
8303bc49a45d5bab0cdbd4f2d793088f600f715f)
(cherry picked from commit
756b5032032c58815a227fdfd27140373d8ebc8c)
Volker Lendecke [Mon, 30 Nov 2009 20:48:33 +0000 (21:48 +0100)]
Fix bug 6546: Avoid accessing buf[-1] if NUL byte comes from fgets
(cherry picked from commit
c0282f8f7d40b893610fdc235cb130f1fedbeb13)
Bo Yang [Mon, 30 Nov 2009 17:05:35 +0000 (01:05 +0800)]
Bo Yang [Mon, 30 Nov 2009 17:05:10 +0000 (01:05 +0800)]
Revert "s3: Fix crash in free_file_list()."
This reverts commit
9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6.
(cherry picked from commit
cdbf7708c219f12432c8cac237dd9c1144b8ee22)
Karolin Seeger [Mon, 30 Nov 2009 13:53:23 +0000 (14:53 +0100)]
s3:docs: Fix typo in man mount.cifs.
Fix bug #6844 (wrong credential file format in mount.cifs manpage).
Thanks to the Debian Samba package maintainers for reporting!
Karolin
(cherry picked from commit
3b7f8a759f57f32a8c1bc2db85236e88f616ffd9)
(cherry picked from commit
54e2e0ae51e2e126696570104ed64d0458beb4ce)
Karolin Seeger [Mon, 30 Nov 2009 12:34:34 +0000 (13:34 +0100)]
s3:docs: Document "aio write behind".
Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).
Karolin
(cherry picked from commit
fde7c2ab19bc7442d8ee9d85ab2fe54e0cfb4782)
(cherry picked from commit
267ebc03b43dd8c11f5aebf341620b0d94d95135)
Karolin Seeger [Mon, 30 Nov 2009 11:29:27 +0000 (12:29 +0100)]
s3:docs: Document "ldap page size".
Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).
Karolin
(cherry picked from commit
9478ec35b5349f50a61bbe2aa88af88577918e91)
(cherry picked from commit
940121d666b9e0645584c93db178b763ac5c8c04)
Bo Yang [Mon, 30 Nov 2009 11:39:33 +0000 (19:39 +0800)]
s3: Fix commit
9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6.
Signed-off-by: Bo Yang <boyang@samba.org>
(cherry picked from commit
509b42486e5f98343d95100c12969703398a248d)
Günther Deschner [Fri, 27 Nov 2009 22:14:27 +0000 (23:14 +0100)]
s4-smbtorture: more and stricter tests for printer and data keys in RPC-SPOOLSS.
Guenther
(cherry picked from commit
8f6df5d3ec31a8c3dedfdfc506c44e03026d8485)
(cherry picked from commit
e1468d0935140f99412dc92b32d38e64c21d6b75)
Günther Deschner [Fri, 27 Nov 2009 19:08:44 +0000 (20:08 +0100)]
s3-kerberos: fix the build on Mac OS X 10.6.2.
Guenther
(cherry picked from commit
51328a7056918bc75a7c1c442f47cf0271075542)
(cherry picked from commit
3788ac88eff1b8912916d9f5f288545741c26f11)
Günther Deschner [Fri, 27 Nov 2009 17:51:56 +0000 (18:51 +0100)]
s3-kerberos: add a missing reference to authdata headers.
Guenther
(cherry picked from commit
da79cbb0800dd647be864e8bbb5fe1132708174b)
(cherry picked from commit
80da9b6fe45122f847bb3219779f4d4f59484398)
Günther Deschner [Fri, 27 Nov 2009 17:30:18 +0000 (18:30 +0100)]
s3-kerberos: do not include authdata headers before including krb5 headers.
Guenther
(cherry picked from commit
ae207370667a12db53362ee5dcdab8e6d4bb388f)
(cherry picked from commit
15bc4a0a928a0b750e09be49455a831d607c449f)
Günther Deschner [Thu, 26 Nov 2009 18:01:54 +0000 (19:01 +0100)]
s3-spoolss: simplify _spoolss_EnumPrinterKey a little more.
Guenther
(cherry picked from commit
e512ccb5b677fa7f285829ec645fc067837c0e11)
(cherry picked from commit
281e09887cbca031600b52850b31e04bfa758e6e)
Günther Deschner [Fri, 27 Nov 2009 14:52:57 +0000 (15:52 +0100)]
s3-kerberos: only use krb5 headers where required.
This seems to be the only way to deal with mixed heimdal/MIT setups during
merged build.
Guenther
(cherry picked from commit
04f8c229de7ffad5f4ec1a0bb68c2c8b4ccf4e15)
(cherry picked from commit
da926c1249705b95344730539c64111876955151)
Günther Deschner [Fri, 27 Nov 2009 10:18:30 +0000 (11:18 +0100)]
misc: mark winreg_Data little-endian except for a REG_DWORD_BIG_ENDIAN.
Guenther
(cherry picked from commit
23d77be6cb8847cbdad859269faf59fea30b27b8)
(cherry picked from commit
a6d3e0e7f20f393f1040cca57b3a0a5b91f064c1)
Günther Deschner [Fri, 27 Nov 2009 15:06:40 +0000 (16:06 +0100)]
pidl: fix handling of output arguments in s3 client stubs.
a20e095 used (uint8_t) instead of (uint8_t *).
Guenther
(cherry picked from commit
79f82998b1aa8349f76a4c82c17daf7e03cdb41a)
(cherry picked from commit
8f1361e627aba9ef3f207cb9a38c4394bd55ccff)
Günther Deschner [Thu, 25 Jun 2009 16:18:50 +0000 (18:18 +0200)]
s3-nsstest: drastically shrink size and dependencies of nsstest binary.
The size went down from 6.4M to 104K on my box.
Guenther
(cherry picked from commit
d6c60f8447ce92a15d48a35d3f21d881c4428663)
(cherry picked from commit
2b7e84f217b523aec81f160740f63d50e4f00a05)
Günther Deschner [Fri, 27 Nov 2009 00:06:36 +0000 (01:06 +0100)]
s3-kerberos: Fix Bug #6929: build with recent heimdal.
Heimdal changed the KRB5_DEPRECATED define (which now may not take an identifier
for activation) in new releases (like 1.3.1).
Guenther
(cherry picked from commit
1a8f8382740e352a83133b8c49aaedd4716210cd)
(cherry picked from commit
b22a7521f62c2ae0d4a8fca4c5b9985de7adee26)
Günther Deschner [Thu, 26 Nov 2009 22:46:50 +0000 (23:46 +0100)]
s3-spoolss: use macros to fillup driver levels.
Guenther
(cherry picked from commit
49e464cef5ed75976fcd6c544bffbd4391f3a1b6)
(cherry picked from commit
f0d52b55896fbb1802aa90fa5ec2b16438373ccf)
Bo Yang [Mon, 30 Nov 2009 09:30:25 +0000 (17:30 +0800)]
s3: Fix crash in free_file_list().
Signed-off-by: Bo Yang <boyang@samba.org>
(cherry picked from commit
62a27325d99cf4371fe98d049110e585dd209c98)
(cherry picked from commit
9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6)
Karolin Seeger [Mon, 30 Nov 2009 10:40:06 +0000 (11:40 +0100)]
s3:docs: Document "enable core files".
Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).
Karolin
(cherry picked from commit
b03ad70848e6ea889f382c0cb9f21057370f1ab6)
(cherry picked from commit
15f7b70b0e6b6bd2604255cff1c351bb0425e9f3)
Karolin Seeger [Mon, 30 Nov 2009 10:04:50 +0000 (11:04 +0100)]
s3:docs: Document "cache directory" and "state directory".
Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).
Karolin
(cherry picked from commit
0003b5fad1dee687bc15dfad9f71b6dfc40556d7)
(cherry picked from commit
d677cea90f0b28d65ddba551acaed9157ea30c2e)