[SCM] Samba Shared Repository - branch v4-4-stable updated
[email protected] (Karolin Seeger)
| Newsgroups | gmane.network.samba.cvs |
|---|---|
| Message-ID | <[email protected]> |
The branch, v4-4-stable has been updated
via daef395 VERSION: Disable GIT_SNAPSHOTS for the 4.4.9 release.
via 59d8dc2 WHATSNEW: Add release notes for Samba 4.4.9.
via d1ae599 krb5_wrap: provide CKSUMTYPE_HMAC_SHA1_96_AES_*
via 6b14580 VERSION: Bump version up to 4.4.9...
via 3441478 VERSION: Disable GIT_SNAPSHOTS for the 4.4.8 release.
via b679b88 s3: ntlm_auth: Don't corrupt the output stream with debug messages.
via 8cdedfb lib: security: se_access_check() incorrectly processes owner rights (S-1-3-4) DENY ace entries
via e6b76e8 s3: smbd: Add missing permissions check on destination folder.
via 17e1fe1 s3: smbd: Make check_parent_access() available to rename code.
via 47f6f77 s3: smbd: rename - missing early error exit if source and destination prefixes are different.
via 9c1aea4 manpages/vfs_fruit: add warning to fruit:resoure=stream
via 4d0b8a5 manpages/vfs_fruit: fruit:resource option misspelling
via 644e503 printing: Fix building with CUPS version older than 1.7
via 56bec86 s3/smbd: fix the last resort check that sets the file type attribute
via 4f01fd9 nss_wins: Fix errno values for HOST_NOT_FOUND
via f1aeb82 s4:torture: Fix cleanup of the secrets object in session_key test
via b3a4efa s4:torture: Normalizes names in session_key test
via 0aa42e6 s4:torture: Strip trailing whitespaces in session_key.c
via 5028180 s4:torture: Add tortue test for AddPrinterDriverEx with COPY_FROM_DIRECTORY
via 6d55997 lib:torture: Make variables const
via f44581b s3:spoolss: Add support for COPY_FROM_DIRECTORY in AddPrinterDriverEx
via b64c1fc ctdb-recovery: Avoid NULL dereference in failure case
via 4ed410e ctdb-locking: Reset real-time priority in lock helper
via c6eebf7 s4-torture: add spoolss_SetPrinter ndr test to validate secdesc_ptr
via ae8131a spoolss: Use correct values for secdesc and devmode pointers
via bcfc67e build: Fix build with perl on debian sid.
via 6a2bb7b ctdb-tests: Add tests for updated Debian style Samba start/stop
via b5e9cf8 ctdb-scripts: Fix Debian init in samba eventscript
via 76c3796 s3: delete_streams: Don't jump to fail: - that resets state.
via 598d79c s3-printing: Allow printer names longer than 16 chars
via b0f9fc4 s3-printing: Correctly encode CUPS printer URIs
via 6420076 vfs:glusterfs: preallocate result for glfs_realpath
via b55e69d s3-winbind: Do not return NO_MEMORY if we have an empty user list
via db76a09 provision: Add support for BIND 9.11.x
via aba190a dlz-bind: Add support for BIND 9.11.x
via 7794252 dlz-bind: Set DNS_CLIENTINFO_VERSION based on BIND version
via b9b99f4 dlz-bind: Fix initialization of DLZ_DLOPEN_AGE
via 7bf1015 dlz-bind: Fix preprocessor checks for BIND versions
via a647bb1 ctdb-packaging: Move CTDB tests to /usr/local/share/ctdb/tests/
via c6177cd s3:smbd: only pass UCF_PREP_CREATEFILE to filename_convert() if we may create a new file
via 14cee44 Revert "ctdb-common: Use SCHED_RESET_ON_FORK when setting SCHED_FIFO"
via a93994b s3: vfs: streams_depot. Use conn->connectpath not conn->cwd.
via bb8e4c7 ctdb-conn: add missing variable initialization
via ac341c7 VERSION: Bump version up to 4.4.8...
from bb02ee9 VERSION: Disable GIT_SNAPSHOTS for the 4.4.8 release.
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-stable
- Log -----------------------------------------------------------------
commit daef395600e23dfda782c556a9e7ef06e395c557
Author: Karolin Seeger <[email protected]>
Date: Mon Jan 2 10:18:13 2017 +0100
VERSION: Disable GIT_SNAPSHOTS for the 4.4.9 release.
Signed-off-by: Karolin Seeger <[email protected]>
commit 59d8dc20e7cbaf574b96b593d75e0df577bdf19e
Author: Karolin Seeger <[email protected]>
Date: Mon Jan 2 10:17:14 2017 +0100
WHATSNEW: Add release notes for Samba 4.4.9.
Signed-off-by: Karolin Seeger <[email protected]>
commit d1ae5997a7928db2ef7d9d7f196c7f5622f22fa3
Author: Stefan Metzmacher <[email protected]>
Date: Tue Jul 19 16:31:01 2016 +0200
krb5_wrap: provide CKSUMTYPE_HMAC_SHA1_96_AES_*
MIT only defined this as CKSUMTYPE_HMAC_SHA1_96_AES128,
while Heimdal has CKSUMTYPE_HMAC_SHA1_96_AES_128.
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Günther Deschner <[email protected]>
(cherry picked from commit bb64c550ae19b08ad4e6d8d26f68c2474cb251e6)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12471
Patches for CVE-2016-2126 break build with MIT Kerberos
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Tue Dec 20 15:58:07 CET 2016 on sn-devel-144
commit 6b14580ad4dbcfc3d396940eaf89701bd17e48a2
Author: Stefan Metzmacher <[email protected]>
Date: Tue Dec 20 08:36:09 2016 +0100
VERSION: Bump version up to 4.4.9...
and re-enable git snapshots.
Signed-off-by: Stefan Metzmacher <[email protected]>
commit 344147822d21a0cee96c1695d2a40306eb2fafdf
Author: Karolin Seeger <[email protected]>
Date: Fri Dec 9 10:59:57 2016 +0100
VERSION: Disable GIT_SNAPSHOTS for the 4.4.8 release.
Signed-off-by: Karolin Seeger <[email protected]>
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Mon Dec 19 14:32:43 CET 2016 on sn-devel-144
commit b679b88bc2fd125bfce892f38a5804c7e93fffee
Author: Jeremy Allison <[email protected]>
Date: Sat Dec 10 13:56:18 2016 -0800
s3: ntlm_auth: Don't corrupt the output stream with debug messages.
Calling programs expect to cleanly read from STDOUT.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12467
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Uri Simchoni <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
(cherry picked from commit 9fbd544b90c2b27985637a9bb3fa520f891f8696)
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Thu Dec 15 12:21:27 CET 2016 on sn-devel-144
commit 8cdedfb6d710846163fca53fb7ec3110b7e60fe4
Author: Jeremy Allison <[email protected]>
Date: Thu Dec 8 10:40:18 2016 -0800
lib: security: se_access_check() incorrectly processes owner rights (S-1-3-4) DENY ace entries
Reported and proposed fix by Shilpa K <[email protected]>.
When processing DENY ACE entries for owner rights SIDs (S-1-3-4) the
code OR's in the deny access mask bits without taking into account if
they were being requested in the requested access mask.
E.g. The current logic has:
An ACL containining:
[0] SID: S-1-3-4
TYPE: DENY
MASK: WRITE_DATA
[1] SID: S-1-3-4
TYPE: ALLOW
MASK: ALLOW_ALL
prohibits an open request by the owner for READ_DATA - even though this
is explicitly allowed.
Furthermore a non-canonical ACL containing:
[0] SID: User SID 1-5-21-something
TYPE: ALLOW
MASK: READ_DATA
[1] SID: S-1-3-4
TYPE: DENY
MASK: READ_DATA
[2] SID: User SID 1-5-21-something
TYPE: ALLOW
MASK: WRITE_DATA
prohibits an open request by the owner for READ_DATA|WRITE_DATA - even
though READ_DATA is explicitly allowed in ACE no 0 and is thus already
filtered out of the "access-still-needed" mask when the deny ACE no 1 is
evaluated.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12466
Signed-off-by: Jeremy Allison <[email protected]>
Signed-off-by: Ralph Boehme <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
(cherry picked from commit 29b02cf22f3c0f2d556408e9e768d68c1efc3b96)
commit e6b76e8f8f7f6bd38c6f32fa9fad108e73f1e803
Author: Jeremy Allison <[email protected]>
Date: Mon Dec 5 14:32:55 2016 -0800
s3: smbd: Add missing permissions check on destination folder.
Based on code from Michael Zeis <[email protected]>.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12460
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
(cherry picked from commit 91b591224ab7f8ea7b4594da9f61efef14353f7f)
commit 17e1fe13f78cc4be83d0981d75740aa7fb240157
Author: Jeremy Allison <[email protected]>
Date: Mon Dec 5 14:32:03 2016 -0800
s3: smbd: Make check_parent_access() available to rename code.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12460
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
(cherry picked from commit beb8a73e95e768565760f79c2a16586bafb4e58c)
commit 47f6f77426449da1cba5400329aadd996dae1c4d
Author: Jeremy Allison <[email protected]>
Date: Mon Dec 5 14:13:14 2016 -0800
s3: smbd: rename - missing early error exit if source and destination prefixes are different.
Noticed by Michael Zeis <[email protected]>.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12460
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
(cherry picked from commit 2bfad1c9d3237ad8d174b7dc2d1e6e3c53fdb8dc)
commit 9c1aea4790a30a88f603d3a1b65ecd9cb5ac4a26
Author: Ralph Boehme <[email protected]>
Date: Thu Nov 10 09:07:41 2016 +0100
manpages/vfs_fruit: add warning to fruit:resoure=stream
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12412
Signed-off-by: Ralph Boehme <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Thu Dec 8 14:52:52 CET 2016 on sn-devel-144
commit 4d0b8a52ea3da998ce7ce215a5c7a5682b710bfd
Author: Ralph Boehme <[email protected]>
Date: Thu Nov 10 08:57:12 2016 +0100
manpages/vfs_fruit: fruit:resource option misspelling
Due to a misspelling in the option parser in all Samba versions up to
and including 4.5.1 this options must be given "fruit:ressource", ie
with two "s".
Samba 4.6 will accept both the correct the correct and the wrong
spelling, Samba 4.7 onwards will only accept the correct
spelling.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12412
Signed-off-by: Ralph Boehme <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit 644e503e821325d39b6b2c29b01b6d165fcbd485
Author: Andreas Schneider <[email protected]>
Date: Tue Dec 6 09:44:28 2016 +0100
printing: Fix building with CUPS version older than 1.7
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12183
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Karolin Seeger <[email protected]>
commit 56bec8696868f3c784f790f3a373546509007f83
Author: Jeremy Allison <[email protected]>
Date: Fri Nov 18 10:20:41 2016 -0800
s3/smbd: fix the last resort check that sets the file type attribute
The rule is, a directory (with any other attributes) should always also
set FILE_ATTRIBUTE_DIRECTORY, a file should only set
FILE_ATTRIBUTE_NORMAL if no other attributes is set.
Iow, if a file contains any existing attributes (e.g. FILE_ATTRIBUTE_HIDDEN),
don't add in the FILE_ATTRIBUTE_NORMAL attribute.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12436
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
Autobuild-User(master): Ralph Böhme <[email protected]>
Autobuild-Date(master): Sat Nov 19 11:55:35 CET 2016 on sn-devel-144
(cherry picked from commit a0783e8dd966a0b2d24d2ca5baa6bed3fe5a7d5a)
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Thu Dec 1 14:51:30 CET 2016 on sn-devel-144
commit 4f01fd9b0933bb7780082309fbabc7f76a157af0
Author: Andreas Schneider <[email protected]>
Date: Sun Nov 13 17:40:21 2016 +0100
nss_wins: Fix errno values for HOST_NOT_FOUND
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12269
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit 08d1ac0e36339e97e4464f6a6724464b0a568347)
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Wed Nov 30 15:50:43 CET 2016 on sn-devel-144
commit f1aeb82671f77e716ff82ed6c20d98d848bce6b7
Author: Andreas Schneider <[email protected]>
Date: Thu Nov 17 16:15:54 2016 +0100
s4:torture: Fix cleanup of the secrets object in session_key test
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12433
The test is known to be failing if sealing is turned on in some
circumstances. In this case a secret is created and then the function
dcerpc_fetch_session_key() fails. The secret is not removed!
We use torturesecret-%08x with random() to fill in the number. Sometimes
it happens that random() returns a number we already used. So we end up
trying to create a secret for an entry which already exists and run
into a collision
This change makes sure we always cleanup behind us and do not leave
secret objects we created.
Pair-Programmed-With: Guenther Deschner <[email protected]>
Signed-off-by: Andreas Schneider <[email protected]>
Signed-off-by: Guenther Deschner <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Thu Nov 17 22:30:36 CET 2016 on sn-devel-144
(cherry picked from commit 9de04626c058563a6cf4c13e4f5399039e345ef5)
commit b3a4efa131f9c833de0610654c15952787b01ab1
Author: Andreas Schneider <[email protected]>
Date: Thu Nov 17 15:44:13 2016 +0100
s4:torture: Normalizes names in session_key test
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12433
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit 31d21de548d899f82fa7944767ad94e8aca8d96d)
commit 0aa42e6b6a46388d162ff350648710c0dfc657fa
Author: Andreas Schneider <[email protected]>
Date: Thu Nov 17 15:35:47 2016 +0100
s4:torture: Strip trailing whitespaces in session_key.c
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12433
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit 80f7f568f8960c809756d5233c8f875db4ea07d6)
commit 50281803862f1fbc371ad7e3712ba9257d0c246b
Author: Andreas Schneider <[email protected]>
Date: Tue Nov 15 18:34:22 2016 +0100
s4:torture: Add tortue test for AddPrinterDriverEx with COPY_FROM_DIRECTORY
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12415
Pair-Programmed-With: Guenther Deschner <[email protected]>
Signed-off-by: Andreas Schneider <[email protected]>
Signed-off-by: Guenther Deschner <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit b1ade58ffeb56a0238c820797905caa107b08265)
commit 6d55997759bb27072335253864ab2c58e51130f1
Author: Andreas Schneider <[email protected]>
Date: Fri Nov 18 10:51:57 2016 +0100
lib:torture: Make variables const
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12415
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit 9c0f2576d8aa3dd95be1c5ddda2b10d891add0bc)
commit f44581b025f24fcdaccba7dd8d60da76a8388795
Author: Andreas Schneider <[email protected]>
Date: Tue Nov 15 14:29:29 2016 +0100
s3:spoolss: Add support for COPY_FROM_DIRECTORY in AddPrinterDriverEx
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12415
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit 4d9f4bfc69a5899bdf91406dfb7efb70a530446c)
commit b64c1fc53476804a4cac7fa9e2ccfb4efbac36e9
Author: Amitay Isaacs <[email protected]>
Date: Fri Nov 18 11:47:56 2016 +1100
ctdb-recovery: Avoid NULL dereference in failure case
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12434
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Mon Nov 21 12:26:04 CET 2016 on sn-devel-144
(cherry picked from commit 54e392b385728bba047404465207340a2e354ec6)
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Tue Nov 22 13:32:29 CET 2016 on sn-devel-144
commit 4ed410e7bdfdb650263207e67f456bcd936e8514
Author: Amitay Isaacs <[email protected]>
Date: Thu Nov 17 16:10:51 2016 +1100
ctdb-locking: Reset real-time priority in lock helper
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12392
Earlier we were relying on SCHED_RESET_ON_FORK to reset the priority of lock
helper processes. Since SCHED_RESET_ON_FORK support has been removed, the
scheduling priority of child processes created using vfork() need to be reset
explicitly in the helper processes.
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Fri Nov 18 10:18:27 CET 2016 on sn-devel-144
(cherry picked from commit 6c6d63c04497fdfdbe665508f2a503f2392dc526)
commit c6eebf79f9b26943774de07bc6efd684e8094d29
Author: Günther Deschner <[email protected]>
Date: Fri Nov 11 19:17:55 2016 +0100
s4-torture: add spoolss_SetPrinter ndr test to validate secdesc_ptr
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11197
Guenther
Signed-off-by: Guenther Deschner <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit 574dd65a8185c90828e49b295d89153bae1563bf)
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Fri Nov 18 12:29:24 CET 2016 on sn-devel-144
commit ae8131ac1e8001a133d7bf0fba003cd8e6672270
Author: Günther Deschner <[email protected]>
Date: Fri Nov 11 16:29:20 2016 +0100
spoolss: Use correct values for secdesc and devmode pointers
ULONG_PTR needs to be decoded as a uint3264 and not as a 'uint32 *'.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11197
Guenther
Pair-Programmed-With: Andreas Schneider <[email protected]>
Signed-off-by: Guenther Deschner <[email protected]>
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit 73f664710a8c9b312a54d0cf41d2f4440c8b42eb)
commit bcfc67e6e9c2c0209429d0b9aaa5ac277a47e97d
Author: Andrew Bartlett <[email protected]>
Date: Wed Oct 26 00:06:12 2016 +1300
build: Fix build with perl on debian sid.
build: Fix build with perl on debian sid.
It appears that "." is no longer in perl_inc
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12395
Signed-off-by: Andrew Bartlett <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Sat Oct 29 09:32:37 CEST 2016 on sn-devel-144
(cherry picked from commit da67acbcfe2167fce9c360a55416ab10e9537a2a)
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Wed Nov 16 14:32:10 CET 2016 on sn-devel-144
commit 6a2bb7b70b55f9c83c3733d312e9fe595d5edafb
Author: Martin Schwenke <[email protected]>
Date: Fri Nov 4 11:47:18 2016 +1100
ctdb-tests: Add tests for updated Debian style Samba start/stop
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12371
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
Autobuild-User(master): Amitay Isaacs <[email protected]>
Autobuild-Date(master): Mon Nov 7 08:01:28 CET 2016 on sn-devel-144
(cherry picked from commit 5c53d50784b2d7883f3e1d9ac48bb1fd56ba7f42)
commit b5e9cf88d3391b536d5caeea38c81ca36024a649
Author: Mathieu Parent <[email protected]>
Date: Mon Oct 31 15:17:34 2016 +0100
ctdb-scripts: Fix Debian init in samba eventscript
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12371
Signed-off-by: Mathieu Parent <[email protected]>
Signed-off-by: Stefan Kania <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
(cherry picked from commit 385aef614034a3f32276e19312f089990e6dbb85)
commit 76c37961207dbe5f83b6b3ed0e3edb1142919d64
Author: Jeremy Allison <[email protected]>
Date: Thu Sep 29 12:44:17 2016 -0700
s3: delete_streams: Don't jump to fail: - that resets state.
Signed-off-by: Jeremy Allison <[email protected]>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12299
commit 598d79c99129c92d363292c29eae6c0b6d36a903
Author: Andreas Schneider <[email protected]>
Date: Thu Nov 10 11:47:54 2016 +0100
s3-printing: Allow printer names longer than 16 chars
Printers with long names are supported in the meantime. However we issue
a warning that if one printer exceeeds 15 chars we warn about it.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12195
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit 2611fd02a0a6a0a0a506df70fe1a1eb4a2e76062)
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Mon Nov 14 15:56:11 CET 2016 on sn-devel-144
commit b0f9fc4d3c7c0dc40bc6b222426a8b9e0d2b17c2
Author: Andreas Schneider <[email protected]>
Date: Wed Nov 9 19:05:49 2016 +0100
s3-printing: Correctly encode CUPS printer URIs
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12183
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit c160ae9afb222466c50ae170447a6a0805f7169f)
commit 64200769c2649c44791ca3ac29442b8d42a035e6
Author: Michael Adam <[email protected]>
Date: Fri Oct 21 00:15:06 2016 +0200
vfs:glusterfs: preallocate result for glfs_realpath
https://bugzilla.samba.org/show_bug.cgi?id=12404
This makes us independent of the allocation
method used inside glfs_realpath.
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Ira Cooper <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Sat Oct 22 00:28:41 CEST 2016 on sn-devel-144
(cherry picked from commit 92a0a56c3852726e0812d260e043957c879aefa4)
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Tue Nov 8 15:35:20 CET 2016 on sn-devel-144
commit b55e69db07c3f82b8447f7a60994828c87ab037b
Author: Andreas Schneider <[email protected]>
Date: Wed Nov 2 17:19:09 2016 +0100
s3-winbind: Do not return NO_MEMORY if we have an empty user list
The domain child for the MACHINE ACCOUNT might fail with
NT_STATUS_NO_MEMORY because an emtpy user list is returned.
*pnum_info is already set to 0 at the beginngin so we should just
declare victory here!
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12405
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit e714dc03e0ccf9ec17da6bacc1bcfcaea7518e22)
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Fri Nov 4 15:18:16 CET 2016 on sn-devel-144
commit db76a09c69cd9dfdc362ea98b3479e6763b9ff19
Author: Amitay Isaacs <[email protected]>
Date: Tue Sep 27 00:51:03 2016 +1000
provision: Add support for BIND 9.11.x
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12366
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Fri Oct 28 03:42:25 CEST 2016 on sn-devel-144
(cherry picked from commit 2959c8888d46902e140963ed4190d23a7609b8da)
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Thu Nov 3 12:29:19 CET 2016 on sn-devel-144
commit aba190a3d743d5c4de343b9d988a4a6559614e43
Author: Amitay Isaacs <[email protected]>
Date: Tue Sep 27 00:51:03 2016 +1000
dlz-bind: Add support for BIND 9.11.x
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12366
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit c8c330d5f4921aaca803b9ff571aacb0dde0c7bc)
commit 77942528d61843fc5b6e8f95cc2ed29f80534ae5
Author: Amitay Isaacs <[email protected]>
Date: Tue Sep 27 01:00:34 2016 +1000
dlz-bind: Set DNS_CLIENTINFO_VERSION based on BIND version
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12366
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit e63e51a2cfd89c5bb2c16b2521ffce864ca5b373)
commit b9b99f4993658930a8ae0cad2965a9fa7da29142
Author: Amitay Isaacs <[email protected]>
Date: Tue Sep 27 00:57:00 2016 +1000
dlz-bind: Fix initialization of DLZ_DLOPEN_AGE
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12366
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit 370d6baaa60ca7aacab85852622cdca8bdb06d34)
commit 7bf1015f2ddf377d8be1c93fce51f59b30ba7ed7
Author: Amitay Isaacs <[email protected]>
Date: Tue Sep 27 00:52:53 2016 +1000
dlz-bind: Fix preprocessor checks for BIND versions
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12366
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit fbafd2699b03902cbb7e5131ed7d345190798392)
commit a647bb18a5a27ed0e5bc69c45285fda985008f61
Author: Martin Schwenke <[email protected]>
Date: Tue Oct 11 11:30:37 2016 +1100
ctdb-packaging: Move CTDB tests to /usr/local/share/ctdb/tests/
In time, other things will end up in /use/local/share/ctdb/.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12104
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
(cherry picked from commit fd8e562069e3c01720be62069b7d58d14c10afd5)
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Mon Oct 31 14:58:04 CET 2016 on sn-devel-144
commit c6177cd24ec3d557f0ce1230566d9a08ae58de09
Author: Stefan Metzmacher <[email protected]>
Date: Thu Oct 13 12:42:59 2016 +0200
s3:smbd: only pass UCF_PREP_CREATEFILE to filename_convert() if we may create a new file
This fixes a regression introduced by commit
f98d10af2a05f0261611f4cabdfe274cd9fe91c0
(smbd: Always use UCF_PREP_CREATEFILE for filename_convert calls to resolve a path for open)
The main problem was that Windows client seem to verify
the access to user.V2\ntuser.ini is rejected with NT_STATUS_ACCESS_DENIED,
using the machine credentials.
Passing UCF_PREP_CREATEFILE to filename_convert() triggers a code path
that implements a dropbox behaviour. A dropbox is a directory with only -wx permissions,
so get_real_filename fails with EACCESS, it needs to list the directory.
EACCESS is ignored with UCF_PREP_CREATEFILE.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10297
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Tue Oct 25 05:33:36 CEST 2016 on sn-devel-144
(cherry picked from commit 759416582c54a16aacbef0e0dfe4649bddff8c5e)
commit 14cee44d6976cbe05079dc00eb2f883ded040114
Author: Amitay Isaacs <[email protected]>
Date: Mon Oct 24 18:24:54 2016 +1100
Revert "ctdb-common: Use SCHED_RESET_ON_FORK when setting SCHED_FIFO"
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12392
Feature SCHED_RESET_ON_FORK is completely broken on RHEL6 and RHEL7
distributions. So do not rely on SCHED_RESET_ON_FORK for now.
This reverts commit 1be8564e553ce044426dbe7b3987edf514832940.
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Tue Oct 25 11:28:28 CEST 2016 on sn-devel-144
(cherry picked from commit 71b69b0169dc6e2843325f1567f64b6acd43e6b8)
commit a93994b1bb867d592ae5e8164d4295ab3715fc10
Author: Jeremy Allison <[email protected]>
Date: Fri Oct 21 11:04:02 2016 -0700
s3: vfs: streams_depot. Use conn->connectpath not conn->cwd.
conn->cwd can change over the life of the connection,
conn->connectpath remains static.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12387
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Uri Simchoni <[email protected]>
Autobuild-User(master): Uri Simchoni <[email protected]>
Autobuild-Date(master): Mon Oct 24 23:52:48 CEST 2016 on sn-devel-144
(cherry picked from commit 1366385d1c3e9ac0556e954864e60e72f6906942)
commit bb8e4c78e8bc1ad359906866dbe7c74d7845bc9c
Author: Ralph Wuerthner <[email protected]>
Date: Mon Oct 10 16:26:05 2016 +0200
ctdb-conn: add missing variable initialization
Avoid potential crash in TALLOC_FREE(hdr).
Signed-off-by: Ralph Wuerthner <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
(cherry picked from commit 4194c0797f78293fe48105ce5af70f36a3c233a8)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12372
ctdb: bad free in ctdbd_migrate()
commit ac341c7e01d72484b39c782b7e0d2d51dd4817d9
Author: Karolin Seeger <[email protected]>
Date: Tue Oct 25 12:39:39 2016 +0200
VERSION: Bump version up to 4.4.8...
and re-enable git snapshots.
Signed-off-by: Karolin Seeger <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
WHATSNEW.txt | 86 ++++++++++-
buildtools/wafsamba/samba_perl.py | 3 +-
ctdb/common/system_util.c | 8 +-
ctdb/config/events.d/50.samba | 4 +-
ctdb/packaging/RPM/ctdb.spec.in | 4 +-
ctdb/server/ctdb_lock_helper.c | 2 +
ctdb/server/ctdb_recovery_helper.c | 1 +
ctdb/tests/eventscripts/50.samba.shutdown.011.sh | 15 ++
ctdb/tests/eventscripts/50.samba.startup.011.sh | 15 ++
ctdb/tests/eventscripts/etc-ctdb/rc.local | 2 +-
ctdb/tests/eventscripts/scripts/local.sh | 4 +-
ctdb/wscript | 2 +-
docs-xml/manpages/vfs_fruit.8.xml | 31 +++-
lib/krb5_wrap/krb5_samba.h | 11 ++
lib/torture/torture.h | 8 +-
libcli/security/access_check.c | 2 +-
librpc/idl/spoolss.idl | 20 +--
nsswitch/wins.c | 3 +-
python/samba/provision/sambadns.py | 6 +-
source3/include/nt_printing.h | 7 +-
source3/lib/ctdbd_conn.c | 2 +-
source3/modules/vfs_glusterfs.c | 15 +-
source3/modules/vfs_streams_depot.c | 3 +-
source3/printing/nt_printing.c | 92 ++++++++++--
source3/printing/print_cups.c | 134 ++++++++++++++---
source3/printing/print_standard.c | 55 ++++---
source3/rpc_client/init_spoolss.c | 4 +-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 17 ++-
source3/rpcclient/cmd_spoolss.c | 4 +-
source3/smbd/close.c | 3 +-
source3/smbd/dosmode.c | 10 +-
source3/smbd/filename.c | 23 +++
source3/smbd/nttrans.c | 8 +-
source3/smbd/open.c | 2 +-
source3/smbd/proto.h | 4 +
source3/smbd/reply.c | 56 ++++---
source3/smbd/smb2_create.c | 10 +-
source3/utils/ntlm_auth.c | 6 +-
source3/winbindd/winbindd_rpc.c | 4 +
source4/dns_server/dlz_minimal.h | 54 +++++--
source4/dns_server/wscript_build | 10 ++
source4/setup/named.conf.dlz | 3 +
source4/torture/ndr/spoolss.c | 57 ++++++++
source4/torture/rpc/session_key.c | 100 +++++++------
source4/torture/rpc/spoolss.c | 179 ++++++++++++++++++++++-
source4/torture/rpc/spoolss_notify.c | 4 +-
47 files changed, 888 insertions(+), 207 deletions(-)
create mode 100755 ctdb/tests/eventscripts/50.samba.shutdown.011.sh
create mode 100755 ctdb/tests/eventscripts/50.samba.startup.011.sh
Changeset truncated at 500 lines:
diff --git a/VERSION b/VERSION
index 51e5478..aa1d8a0 100644
--- a/VERSION
+++ b/VERSION
@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=4
SAMBA_VERSION_MINOR=4
-SAMBA_VERSION_RELEASE=8
+SAMBA_VERSION_RELEASE=9
########################################################
# If a official release has a serious bug #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 1fee16b..3f0946c 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,86 @@
=============================
+ Release Notes for Samba 4.4.9
+ January 2, 2017
+ =============================
+
+
+This is the latest stable release of Samba 4.4.
+
+
+Changes since 4.4.8:
+--------------------
+
+o Michael Adam <[email protected]>
+ * BUG 12404: vfs:glusterfs: Preallocate result for glfs_realpath.
+
+o Jeremy Allison <[email protected]>
+ * BUG 12299: Fix unitialized variable warnings in smbd open.c and close.c.
+ * BUG 12387: s3: vfs: streams_depot. Use conn->connectpath not conn->cwd.
+ * BUG 12436: s3/smbd: Fix the last resort check that sets the file type
+ attribute.
+
+o Andrew Bartlett <[email protected]>
+ * BUG 12395: build: Fix build with perl on debian sid.
+
+o Ralph Boehme <[email protected]>
+ * BUG 12412: Fix typo in vfs_fruit: fruit:ressource -> fruit:resource.
+
+o Günther Deschner <[email protected]>
+ * BUG 11197: spoolss: Use correct values for secdesc and devmode pointers.
+
+o Amitay Isaacs <[email protected]>
+ * BUG 12366: provision: Add support for BIND 9.11.x.
+ * BUG 12392: ctdb-locking: Reset real-time priority in lock helper.
+ * BUG 12434: ctdb-recovery: Avoid NULL dereference in failure case.
+
+o Stefan Metzmacher <[email protected]>
+ * BUG 10297: s3:smbd: Only pass UCF_PREP_CREATEFILE to filename_convert() if
+ we may create a new file.
+ * BUG 12471: Fix build with MIT Kerberos.
+
+o Mathieu Parent <[email protected]>
+ * BUG 12371: ctdb-scripts: Fix Debian init in Samba eventscript.
+
+o Andreas Schneider <[email protected]>
+ * BUG 12183: s3-printing: Correctly encode CUPS printer URIs.
+ * BUG 12195: s3-printing: Allow printer names longer than 16 chars.
+ * BUG 12269: nss_wins: Fix errno values for HOST_NOT_FOUND.
+ * BUG 12405: s3-winbind: Do not return NO_MEMORY if we have an empty user
+ list.
+ * BUG 12415: s3:spoolss: Add support for COPY_FROM_DIRECTORY in
+ AddPrinterDriverEx.
+
+o Martin Schwenke <[email protected]>
+ * BUG 12104: ctdb-packaging: Move CTDB tests to /usr/local/share/ctdb/tests/.
+
+o Ralph Wuerthner <[email protected]>
+ * BUG 12372: ctdb-conn: Add missing variable initialization.
+
+
+#######################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored. All bug reports should
+be filed under the "Samba 4.1 and newer" product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older releases follow:
+----------------------------------------
+
+ =============================
Release Notes for Samba 4.4.8
December 19, 2016
=============================
@@ -77,8 +159,8 @@ database (https://bugzilla.samba.org/).
======================================================================
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
+
=============================
Release Notes for Samba 4.4.7
diff --git a/buildtools/wafsamba/samba_perl.py b/buildtools/wafsamba/samba_perl.py
index f2f176d..2e9a53a 100644
--- a/buildtools/wafsamba/samba_perl.py
+++ b/buildtools/wafsamba/samba_perl.py
@@ -49,7 +49,8 @@ def SAMBA_CHECK_PERL(conf, mandatory=True, version=(5,0,0)):
conf.env.PERL_LIB_INSTALL_DIR = perl_lib_install_dir
perl_inc = read_perl_config_var('print "@INC"')
- perl_inc.remove('.')
+ if '.' in perl_inc:
+ perl_inc.remove('.')
conf.start_msg("PERL_INC: ")
conf.end_msg("%s" % (perl_inc), 'GREEN')
conf.env.PERL_INC = perl_inc
diff --git a/ctdb/common/system_util.c b/ctdb/common/system_util.c
index e6c4f17..738bf9c 100644
--- a/ctdb/common/system_util.c
+++ b/ctdb/common/system_util.c
@@ -67,14 +67,10 @@ bool set_scheduler(void)
#else /* no AIX */
#if HAVE_SCHED_SETSCHEDULER
struct sched_param p;
- int policy = SCHED_FIFO;
p.sched_priority = 1;
-#ifdef SCHED_RESET_ON_FORK
- policy |= SCHED_RESET_ON_FORK;
-#endif
- if (sched_setscheduler(0, policy, &p) == -1) {
+ if (sched_setscheduler(0, SCHED_FIFO, &p) == -1) {
DEBUG(DEBUG_CRIT,("Unable to set scheduler to SCHED_FIFO (%s)\n",
strerror(errno)));
return false;
@@ -107,7 +103,6 @@ void reset_scheduler(void)
#endif
#else /* no AIX */
#if HAVE_SCHED_SETSCHEDULER
-#ifndef SCHED_RESET_ON_FORK
struct sched_param p;
p.sched_priority = 0;
@@ -116,7 +111,6 @@ void reset_scheduler(void)
}
#endif
#endif
-#endif
}
void set_nonblocking(int fd)
diff --git a/ctdb/config/events.d/50.samba b/ctdb/config/events.d/50.samba
index 1742ff1..893b9c0 100755
--- a/ctdb/config/events.d/50.samba
+++ b/ctdb/config/events.d/50.samba
@@ -14,8 +14,8 @@ case $CTDB_INIT_STYLE in
CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-nmb}
;;
debian)
- CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-samba}
- CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
+ CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-smbd}
+ CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-nmbd}
;;
*)
# Use redhat style as default:
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index eed4a10..3df5baf 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -240,8 +240,8 @@ test suite for ctdb
%files tests
%defattr(-,root,root)
-%dir %{_datadir}/%{name}-tests
-%{_datadir}/%{name}-tests/*
+%dir %{_datadir}/%{name}/tests
+%{_datadir}/%{name}/tests/*
%dir %{_libexecdir}/%{name}/tests
%{_libexecdir}/%{name}/tests/*
%{_bindir}/ctdb_run_tests
diff --git a/ctdb/server/ctdb_lock_helper.c b/ctdb/server/ctdb_lock_helper.c
index 543c5d0..a5da7cc 100644
--- a/ctdb/server/ctdb_lock_helper.c
+++ b/ctdb/server/ctdb_lock_helper.c
@@ -129,6 +129,8 @@ int main(int argc, char *argv[])
int ppid;
const char *lock_type;
+ reset_scheduler();
+
progname = argv[0];
if (argc < 5) {
diff --git a/ctdb/server/ctdb_recovery_helper.c b/ctdb/server/ctdb_recovery_helper.c
index 5d1fee9..861aa6b 100644
--- a/ctdb/server/ctdb_recovery_helper.c
+++ b/ctdb/server/ctdb_recovery_helper.c
@@ -138,6 +138,7 @@ static struct recdb_context *recdb_create(TALLOC_CTX *mem_ctx, uint32_t db_id,
if (recdb->db == NULL) {
talloc_free(recdb);
LOG("failed to create recovery db %s\n", recdb->db_path);
+ return NULL;
}
recdb->persistent = persistent;
diff --git a/ctdb/tests/eventscripts/50.samba.shutdown.011.sh b/ctdb/tests/eventscripts/50.samba.shutdown.011.sh
new file mode 100755
index 0000000..f225e8f
--- /dev/null
+++ b/ctdb/tests/eventscripts/50.samba.shutdown.011.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "shutdown, Debian init style"
+
+setup_samba
+
+export EVENTSCRIPT_TESTS_INIT_STYLE="debian"
+
+ok <<EOF
+Stopping smbd: OK
+Stopping nmbd: OK
+EOF
+simple_test
diff --git a/ctdb/tests/eventscripts/50.samba.startup.011.sh b/ctdb/tests/eventscripts/50.samba.startup.011.sh
new file mode 100755
index 0000000..3205497
--- /dev/null
+++ b/ctdb/tests/eventscripts/50.samba.startup.011.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "shutdown, Debian init style"
+
+setup_samba
+
+export EVENTSCRIPT_TESTS_INIT_STYLE="debian"
+
+ok <<EOF
+Starting nmbd: OK
+Starting smbd: OK
+EOF
+simple_test
diff --git a/ctdb/tests/eventscripts/etc-ctdb/rc.local b/ctdb/tests/eventscripts/etc-ctdb/rc.local
index 0932ab4..1b5d109 100755
--- a/ctdb/tests/eventscripts/etc-ctdb/rc.local
+++ b/ctdb/tests/eventscripts/etc-ctdb/rc.local
@@ -63,5 +63,5 @@ background_with_logging ()
"$@" 2>&1 </dev/null | sed -e 's@^@\&@'
}
-CTDB_INIT_STYLE="redhat"
+CTDB_INIT_STYLE="${EVENTSCRIPT_TESTS_INIT_STYLE:-redhat}"
PATH="${EVENTSCRIPTS_PATH}:$PATH"
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index fcb7519..80230e9 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -727,7 +727,7 @@ setup_samba ()
eventscript_call ctdb_service_managed
# All possible service names for all known distros.
- for i in "smb" "nmb" "samba" ; do
+ for i in "smb" "nmb" "samba" "smbd" "nmbd" ; do
service "$i" force-started
done
@@ -747,7 +747,7 @@ setup_samba ()
eventscript_call ctdb_service_unmanaged
# All possible service names for all known distros.
- for i in "smb" "nmb" "samba" ; do
+ for i in "smb" "nmb" "samba" "smbd" "nmbd" ; do
service "$i" force-stopped
done
diff --git a/ctdb/wscript b/ctdb/wscript
index 4327663..06d954fc 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -207,7 +207,7 @@ def configure(conf):
conf.env.CTDB_RUNDIR))
conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.EXEC_PREFIX,
- 'share/ctdb-tests')
+ 'share/ctdb/tests')
conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests')
# Allow unified compilation and separate compilation of utilities
diff --git a/docs-xml/manpages/vfs_fruit.8.xml b/docs-xml/manpages/vfs_fruit.8.xml
index a275344..0f4d941 100644
--- a/docs-xml/manpages/vfs_fruit.8.xml
+++ b/docs-xml/manpages/vfs_fruit.8.xml
@@ -78,7 +78,27 @@
<varlistentry>
<term>fruit:resource = [ file | xattr | stream ]</term>
<listitem>
- <para>Controls where the OS X resource fork is stored:</para>
+ <para>Controls where the OS X resource fork is stored.</para>
+
+ <para><emphasis>Important: </emphasis>Due to a
+ misspelling in the option parser in all Samba versions
+ 4.5 and earlier, this options must be given as
+ <emphasis>fruit:ressource</emphasis>, ie with two
+ <emphasis>s</emphasis>.</para>
+
+ <para>Users who set this opion to any non-default
+ setting were still using the default setting of
+ <emphasis>file</emphasis> and are advised to adjust
+ their smb.conf to reflect the effective setting and set
+ <emphasis>fruit:ressource=file</emphasis> in their
+ smb.conf. Removing the option line altogether works as
+ well.</para>
+
+ <para>Samba 4.6 will accept both the correct and the
+ wrong spelling, from Samba 4.7 onwards only the correct
+ spelling will be accepted.</para>
+
+ <para>Settings:</para>
<itemizedlist>
<listitem><para><command>file (default)</command> - use a ._
@@ -91,9 +111,12 @@
down to Solaris and derived platforms and
ZFS</para></listitem>
- <listitem><para><command>stream</command> - pass the
- stream on to the next module in the VFS
- stack</para></listitem>
+ <listitem><para><command>stream (experimental)</command> - pass
+ the stream on to the next module in the VFS stack.
+ <emphasis>Warning: </emphasis> this option should not be used
+ with the <emphasis>streams_xattr</emphasis> module due to the
+ extended attributes size limitations of most
+ filesytems.</para></listitem>
</itemizedlist>
</listitem>
diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index cef9144..20ef6a3 100644
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -74,6 +74,17 @@
#define CKSUMTYPE_HMAC_MD5 CKSUMTYPE_HMAC_MD5_ARCFOUR
#endif
+/*
+ * CKSUMTYPE_HMAC_SHA1_96_AES_* in Heimdal
+ * CKSUMTYPE_HMAC_SHA1_96_AES* in MIT
+ */
+#if defined(CKSUMTYPE_HMAC_SHA1_96_AES128) && !defined(CKSUMTYPE_HMAC_SHA1_96_AES_128)
+#define CKSUMTYPE_HMAC_SHA1_96_AES_128 CKSUMTYPE_HMAC_SHA1_96_AES128
+#endif
+#if defined(CKSUMTYPE_HMAC_SHA1_96_AES256) && !defined(CKSUMTYPE_HMAC_SHA1_96_AES_256)
+#define CKSUMTYPE_HMAC_SHA1_96_AES_256 CKSUMTYPE_HMAC_SHA1_96_AES256
+#endif
+
typedef struct {
#if defined(HAVE_MAGIC_IN_KRB5_ADDRESS) && defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */
krb5_address **addrs;
diff --git a/lib/torture/torture.h b/lib/torture/torture.h
index e710873..05c59e6 100644
--- a/lib/torture/torture.h
+++ b/lib/torture/torture.h
@@ -503,7 +503,7 @@ void torture_result(struct torture_context *test,
} while(0)
#define torture_assert_guid_equal(torture_ctx,got,expected,cmt)\
- do { struct GUID __got = (got), __expected = (expected); \
+ do {const struct GUID __got = (got), __expected = (expected); \
if (!GUID_equal(&__got, &__expected)) { \
torture_result(torture_ctx, TORTURE_FAIL, \
__location__": "#got" was %s, expected %s: %s", \
@@ -521,7 +521,7 @@ void torture_result(struct torture_context *test,
} while(0)
#define torture_assert_sid_equal(torture_ctx,got,expected,cmt)\
- do { struct dom_sid *__got = (got), *__expected = (expected); \
+ do {const struct dom_sid *__got = (got), *__expected = (expected); \
if (!dom_sid_equal(__got, __expected)) { \
torture_result(torture_ctx, TORTURE_FAIL, \
__location__": "#got" was %s, expected %s: %s", \
@@ -531,7 +531,7 @@ void torture_result(struct torture_context *test,
} while(0)
#define torture_assert_not_null(torture_ctx,got,cmt)\
- do { void *__got = (got); \
+ do {const void *__got = (got); \
if (__got == NULL) { \
torture_result(torture_ctx, TORTURE_FAIL, \
__location__": "#got" was NULL, expected != NULL: %s", \
@@ -541,7 +541,7 @@ void torture_result(struct torture_context *test,
} while(0)
#define torture_assert_not_null_goto(torture_ctx,got,ret,label,cmt)\
- do { void *__got = (got); \
+ do {const void *__got = (got); \
if (__got == NULL) { \
torture_result(torture_ctx, TORTURE_FAIL, \
__location__": "#got" was NULL, expected != NULL: %s", \
diff --git a/libcli/security/access_check.c b/libcli/security/access_check.c
index 2be5928..b4c850b 100644
--- a/libcli/security/access_check.c
+++ b/libcli/security/access_check.c
@@ -220,7 +220,7 @@ NTSTATUS se_access_check(const struct security_descriptor *sd,
owner_rights_allowed |= ace->access_mask;
owner_rights_default = false;
} else if (ace->type == SEC_ACE_TYPE_ACCESS_DENIED) {
- owner_rights_denied |= ace->access_mask;
+ owner_rights_denied |= (bits_remaining & ace->access_mask);
owner_rights_default = false;
}
continue;
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index 5bbc267..d17fcf4 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -1011,9 +1011,9 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
[string,charset(UTF16)] uint16 *print_processor;
[string,charset(UTF16)] uint16 *parameters;
[string,charset(UTF16)] uint16 *driver_name;
- uint32 *_devmode_ptr; /* pointer to truncated devicemode */
+ uint3264 _devmode_ptr; /* ULONG_PTR */
[string,charset(UTF16)] uint16 *text_status;
- uint32 *_secdesc_ptr;
+ uint3264 _secdesc_ptr; /* ULONG_PTR */
spoolss_JobStatus status;
[range(0,99)] uint32 priority;
uint32 position;
@@ -1037,9 +1037,9 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
[string,charset(UTF16)] uint16 *print_processor;
[string,charset(UTF16)] uint16 *parameters;
[string,charset(UTF16)] uint16 *driver_name;
- uint32 *_devmode_ptr; /* pointer to truncated devicemode */
+ uint3264 _devmode_ptr; /* ULONG_PTR */
[string,charset(UTF16)] uint16 *text_status;
- uint32 *_secdesc_ptr;
+ uint3264 _secdesc_ptr; /* ULONG_PTR */
spoolss_JobStatus status;
[range(0,99)] uint32 priority;
uint32 position;
@@ -1201,12 +1201,12 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
[string,charset(UTF16)] uint16 *drivername;
[string,charset(UTF16)] uint16 *comment;
[string,charset(UTF16)] uint16 *location;
- uint32 *devmode_ptr;
+ uint3264 devmode_ptr; /* ULONG_PTR */
[string,charset(UTF16)] uint16 *sepfile;
[string,charset(UTF16)] uint16 *printprocessor;
[string,charset(UTF16)] uint16 *datatype;
[string,charset(UTF16)] uint16 *parameters;
- uint32 *secdesc_ptr;
+ uint3264 secdesc_ptr; /* ULONG_PTR */
spoolss_PrinterAttributes attributes;
[range(0,99)] uint32 priority;
uint32 defaultpriority;
@@ -1218,7 +1218,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
} spoolss_SetPrinterInfo2;
typedef struct {
- uint32 *sec_desc_ptr;
+ uint3264 sec_desc_ptr; /* ULONG_PTR */
} spoolss_SetPrinterInfo3;
typedef struct {
@@ -1245,11 +1245,11 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
} spoolss_SetPrinterInfo7;
typedef struct {
- uint32 *devmode_ptr;
+ uint3264 devmode_ptr; /* ULONG_PTR */
} spoolss_SetPrinterInfo8;
typedef struct {
- uint32 *devmode_ptr;
+ uint3264 devmode_ptr; /* ULONG_PTR */
} spoolss_SetPrinterInfo9;
typedef [ms_union,switch_type(uint32)] union {
@@ -2307,7 +2307,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
/* Function: 0x27 */
--
Samba Shared Repository