The branch, v3-5-stable has been updated
via 8a9c863 WHATSNEW: Update changes since 3.5.11.
via 3ae4f66 Fix bug #8542 - smbclient posix_open command fails to
return correct info on open file. (cherry picked from commit
d27f5a277ef47c5ff94e402930680b37e8f4d592) (cherry picked from commit
a7224ca5e77aa3e7d3a460515b07aa5b6cb099ae)
via 8ece6f4 Third part of fix for bug #8541 - readlink() on Linux
clients fails if the symlink target is outside of the share.
via e095988 Second part of fix for bug #8541 - readlink() on Linux
clients fails if the symlink target is outside of the share.
via 1041387 Fix bug #8541 - readlink() on Linux clients fails if the
symlink target is outside of the share.
via df08d03 Use existing ISDOT and ISDOTDOT macros.
via 5ba5025 s3-netapi: remove pointless use_memory_krb5_ccache.
via 09d2c99 WHATSNEW: Add changes since 3.5.11.
via fcc73f8 s3:Makefile: make DSO_EXPORTS_CMD more portable (#8531)
via 3a3d354 Add new contributing FAQ announcing acceptance of corporate
(C).
via 32979e8 s3-docs: Adapt version...
via a29d30b s3/doc: add man page for aio_fork vfs module
via 1ee3254 Fix bug #8515 - Empty CIFS share can be blocked for other
clients by deleting it via empty path (DELETE_PENDING until the last client)
via cf083f6 Bug 7551: Return error of cli_push when 'put - /some/file'
is used
via d5e92b8 Bug 7551: Return error of cli_push when 'put - /some/file'
is used. (cherry picked from commit ff5b58d3038bed5a20511bc76405d8ebdae75a87)
via a9fc6bd Fix bug #8507 - smbd doesn't correctly honor the "force
create mode" bits from a cifsfs create.
via 8ffc3f4 Second part of fix for bug #8443 - Default user entry is
set to minimal permissions on incoming ACL change with no user specified.
via 9fcee67 First part of fix for bug #8443 - Default user entry is set
to minimal permissions on incoming ACL change with no user specified.
via 353f107 Part 3 of bugfix for bug #7509 - smb_acl_to_posix: ACL is
invalid for set (Invalid argument)
via 7af614e Part 2 of bugfix for bug #7509 - smb_acl_to_posix: ACL is
invalid for set (Invalid argument)
via 77ecca5 Part 1 of bugfix for bug #7509 - smb_acl_to_posix: ACL is
invalid for set (Invalid argument)
via 29a438c Fix bug #8458 - IE9 on Windows 7 cannot download files to
samba 3.5.11 share
via 5679f81 Fix bug #8493 - DFS breaks zip file extracting unless
"follow symlinks = no" set
via 7cba110 s3-docs: Remove "experimental" label on VFS ACL modules
via d14dc20 Patch for bug #8156 - net ads join fails to use the user's
kerberos ticket.
via c32c791 Allows changing the maximum number of simultaneous clients
in winbindd through an smb.conf option.
via 6d85cc6 s3-winbind: Fix bug 7888 -- deal with buggy 3.0 based PDCs.
via 8dbbb54 s3-nmbd: fix memleak in create_listen_fdset().
via 8ea73ce libcli/auth: let spnego_write_mech_types() check the
asn1_load() return
via d01176c Fix bug 8480 - acl_xattr can free an invalid pointer if no
blob is loaded. (cherry picked from commit
62b9ad45e27bb6a2af22aa9ee133ed6075abc62b)
via 504b817 s3-netapi: allow to use default krb5 credential cache for
libnetapi users.
via a911587 s3-libnet: allow to use default krb5 ccache in
libnet_Join/libnet_Unjoin.
via 3ff0dc4 s3: Fix bug 7844: Race in winbind
via a1ea933 s3:libsmb: check the wct of the incoming SMBnegprot
responses
via 3479f1f v3-5-test: Fix getent group if trusted domains are not
reachable
via b5c3fa1 Fix bug Bug 8422 - Infinite loop in ACL module code.
via d43d24d s3-vfs: Fix vfs_chown_fsp.
via 1cf18bd s3: Fix bug 8360
via c484e1a s3: Add a fallback for missing open&x support in OS/X Lion
via 5e876f6 s3: Make map_open_params_to_ntcreate() available in lib/
(cherry picked from commit aa0c6eb76a6e16652a2ef46560eaffb881792cf6)
via cefea3b s3: Make is_executable() available in lib/ (cherry picked
from commit 612361bdcaf4256eb54913423e127d0628b35356)
via f9af343 s3: We only need base_name in map_open_params_to_ntcreate
(cherry picked from commit 1fa4b369d2fabbf34cda576d91d8aa9baa4e8b68)
via a7cac5f s3/swat: use strlcat instead of strncat to fix build on old
Linux distros
via f226e03 s3:web/swat: use strtoll() instead of atoi/atol/atoll
via a994e19 WHATSNEW: Fix typo.
from 3683bdf WHATSNEW: Remove wrong entry.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable
- Log -----------------------------------------------------------------
commit 8a9c863ba0acb9ece202e68eca269b5f6ad4570e
Author: Karolin Seeger <[email protected]>
Date: Tue Nov 1 19:51:08 2011 +0100
WHATSNEW: Update changes since 3.5.11.
Karolin
(cherry picked from commit bcf1198b1c03b3f0dd8032df93ff1b30074d37f2)
commit 3ae4f66f8b2d8c4c5a4cd3e4d3f563177e14a73e
Author: Jeremy Allison <[email protected]>
Date: Fri Oct 21 18:08:46 2011 -0700
Fix bug #8542 - smbclient posix_open command fails to return correct info
on open file.
(cherry picked from commit d27f5a277ef47c5ff94e402930680b37e8f4d592)
(cherry picked from commit a7224ca5e77aa3e7d3a460515b07aa5b6cb099ae)
commit 8ece6f449410fb7067d0eee1f10faa9ee7725ad5
Author: Jeremy Allison <[email protected]>
Date: Fri Oct 21 18:35:15 2011 -0700
Third part of fix for bug #8541 - readlink() on Linux clients fails if the
symlink target is outside of the share.
Missed passing ucf_flags instead of hard coded flags in findfirst call.
Autobuild-User: Jeremy Allison <[email protected]>
Autobuild-Date: Sat Oct 22 06:30:16 CEST 2011 on sn-devel-104
(cherry picked from commit f4593181876f7a9ef55ceee8d1a20369197a63ba)
(cherry picked from commit 73aee207497028b524f2f4d011ab28d954a598c7)
commit e0959885005da56865c6f9c46831f3040295a978
Author: Jeremy Allison <[email protected]>
Date: Mon Oct 24 15:34:27 2011 -0700
Second part of fix for bug #8541 - readlink() on Linux clients fails if the
symlink target is outside of the share.
The statcache has to do lstat instead of stat when returning cached
posix pathnames.
(cherry picked from commit 84ce5f1b96be650ad80fa1dc030539113a27c50d)
commit 1041387dfcdd570706cc403b430f4e292487dc56
Author: Jeremy Allison <[email protected]>
Date: Mon Oct 24 15:24:04 2011 -0700
Fix bug #8541 - readlink() on Linux clients fails if the symlink target is
outside of the share.
The key is to only allow the lookup to succeed if it's a UNIX level lookup
or readlink,
but disallow all other operations.
(cherry picked from commit 9685fb343de057598752d8f43d43523cab5c4356)
commit df08d03fef8e629bb48f48c5a587a220e6b9095d
Author: Jeremy Allison <[email protected]>
Date: Mon Jul 25 16:12:45 2011 -0700
Use existing ISDOT and ISDOTDOT macros.
Autobuild-User: Jeremy Allison <[email protected]>
Autobuild-Date: Thu Jul 28 02:09:20 CEST 2011 on sn-devel-104
(cherry picked from commit d82256ca119eb8315cc69ba725ba71c386caa901)
(cherry picked from commit 6ae54263b77f7663df0c390c496a139bed443b27)
commit 5ba502541bc270a940d848b34131cf07c6315944
Author: Günther Deschner <[email protected]>
Date: Wed Oct 26 13:44:49 2011 +0200
s3-netapi: remove pointless use_memory_krb5_ccache.
This breaks the ABI.
Guenther
See bug #7465 for more details.
(cherry picked from commit 9378a904740ee456758e00acdd23e3016d4810ee)
commit 09d2c99faf0761534036935c93fcdbac9478601c
Author: Karolin Seeger <[email protected]>
Date: Mon Oct 24 19:59:21 2011 +0200
WHATSNEW: Add changes since 3.5.11.
Karolin
(cherry picked from commit 0b183a1a44720454fad597a2895762a5d77ed2b8)
commit fcc73f87137b3251bc582ecc7ceb8ecf215322fb
Author: Björn Jacke <[email protected]>
Date: Thu Oct 20 21:39:38 2011 +0200
s3:Makefile: make DSO_EXPORTS_CMD more portable (#8531)
It sems like every not completely trivial sed expression should be tested
with
Solaris' sed. Its regexp engine is way more limited than the one of GNU
sed. Thanks to Michael Pelletier for finding this! This fixes bug #8531
Autobuild-User: Björn Jacke <[email protected]>
Autobuild-Date: Thu Oct 20 23:15:05 CEST 2011 on sn-devel-104
(cherry picked from commit 37be1df3d7534c2cc8e1e25614164c2178372b94)
(cherry picked from commit 763ad499aa4423c5e68a75f20f2ba8ee967e5984)
(cherry picked from commit 53b551d160a9e5b645aaa6582d7ffc82e5e52b59)
commit 3a3d35430fb635d345f3749836d2414a0f6aa51f
Author: Jeremy Allison <[email protected]>
Date: Tue Oct 11 17:00:08 2011 -0700
Add new contributing FAQ announcing acceptance of corporate (C).
Autobuild-User: Jeremy Allison <[email protected]>
Autobuild-Date: Wed Oct 12 03:46:41 CEST 2011 on sn-devel-104
(cherry picked from commit bd01ae227bc567fd7953e446236364fc4d110a48)
(cherry picked from commit f165b54828f451943b172b8d2d1bfd15f37b7fdf)
(cherry picked from commit 390616329875e5f6bdf65c840a12b2e90141bceb)
commit 32979e86fe0c62c3cbfb06b82af619cc8b00a13a
Author: Karolin Seeger <[email protected]>
Date: Tue Oct 18 20:39:49 2011 +0200
s3-docs: Adapt version...
in man vfs_aio_fork.
Karolin
(cherry picked from commit e07423a0d55437fcc85d205214315a21d452cee7)
commit a29d30bf55657a8ecd1c8a136f6ec801681ec62f
Author: Björn Jacke <[email protected]>
Date: Tue Oct 18 10:54:56 2011 +0200
s3/doc: add man page for aio_fork vfs module
thanks to Volker for the content
Autobuild-User: Björn Jacke <[email protected]>
Autobuild-Date: Tue Oct 18 12:24:35 CEST 2011 on sn-devel-104
(cherry picked from commit 56328a4d61c8d0a52f6841097bf8fc4ffd46bfb6)
(cherry picked from commit 51f87fce55d160abed6b04ea27f53f254d2db474)
Fix bug #8256 (vfs_aio_fork is undocumented).
(cherry picked from commit c48f8ae21b8279b9b62aca5e04eb1547c6dbd9c6)
commit 1ee32547cc6cf5ff6afd3cedbc1a466de3692cb7
Author: Volodymyr Khomenko <[email protected]>
Date: Wed Oct 12 09:57:57 2011 -0700
Fix bug #8515 - Empty CIFS share can be blocked for other clients by
deleting it via empty path (DELETE_PENDING until the last client)
Disallow "." in can_set_delete_on_close().
Autobuild-User: Jeremy Allison <[email protected]>
Autobuild-Date: Wed Oct 12 21:07:27 CEST 2011 on sn-devel-104
(cherry picked from commit bd260f03ab492d03c2890db47dc6fb4f1b824a1a)
(cherry picked from commit c6e2256e2ef024ecdbebb9cb04d919342daeb780)
commit cf083f6e07f594b10d7e9dd2b15e742dfdb3432b
Author: Bram <[email protected]>
Date: Thu Sep 29 11:28:03 2011 +0200
Bug 7551: Return error of cli_push when 'put - /some/file' is used
Autobuild-User: Jeremy Allison <[email protected]>
Autobuild-Date: Thu Sep 29 23:47:02 CEST 2011 on sn-devel-104
(cherry picked from commit d883cc664cac81633a60e5b04f99f23a3577ae65)
(cherry picked from commit 20ee0810ff4da3a16a8b7947d4aa0138a8d76577)
commit d5e92b8980a4e770096f71d3ebfa9f982012b115
Author: Jeremy Allison <[email protected]>
Date: Sat Oct 8 20:18:34 2011 +0200
Bug 7551: Return error of cli_push when 'put - /some/file' is used.
(cherry picked from commit ff5b58d3038bed5a20511bc76405d8ebdae75a87)
commit a9fc6bd03469935470d220ce936e77d83b666058
Author: Jeremy Allison <[email protected]>
Date: Tue Oct 4 16:40:58 2011 -0700
Fix bug #8507 - smbd doesn't correctly honor the "force create mode" bits
from a cifsfs create.
Don't manipulate the new_dos_attributes bits until we know it's not a POSIX
open.
(cherry picked from commit 2bdf5042dd14283ae195d442d20385ed158367ae)
commit 8ffc3f4f206dfd729c943505cd36036882bc57ee
Author: Jeremy Allison <[email protected]>
Date: Thu Sep 8 14:10:16 2011 -0700
Second part of fix for bug #8443 - Default user entry is set to minimal
permissions on incoming ACL change with no user specified.
Be smarter about setting default permissions when a ACL_USER_OBJ isn't
given. Use the principle of least surprises for the user.
(cherry picked from commit abf0629535a8082229810c6905c356b20c482be9)
commit 9fcee67236dbbcdff0b5f825d338eae818d4321b
Author: Jeremy Allison <[email protected]>
Date: Thu Sep 8 13:56:06 2011 -0700
First part of fix for bug #8443 - Default user entry is set to minimal
permissions on incoming ACL change with no user specified.
create_default_mode() is not needed - it's taken care of by code
inside ensure_canon_entry_valid().
(cherry picked from commit 0dba9c975a8bfa9e6441c3a4726e1e68cbf364ca)
commit 353f107ac9023b755c1294d2baa6db6a9e13b5bc
Author: Jeremy Allison <[email protected]>
Date: Fri Sep 2 15:08:42 2011 -0700
Part 3 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set
(Invalid argument)
Don't call check_owning_objs() to convert ACL_USER->ACL_USER_OBJ and
AC_GROUP->ACL_GROUP_OBJ for default (directory) ACLs, we do this separately
inside ensure_canon_entry_valid().
(cherry picked from commit 06fd08dea1dde4b86546a8f87574d68dcac0e840)
commit 7af614ea75d272dff8deca44e2e2c57596283a64
Author: Jeremy Allison <[email protected]>
Date: Fri Sep 2 15:07:48 2011 -0700
Part 2 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set
(Invalid argument)
Only map CREATOR_OWNER/CREATOR_GROUP to ACL_USER_OBJ/ACL_GROUP_OBJ in
a default(directory) ACL set.
(cherry picked from commit 36f60cef6d6ac5625a88a73ce53bdb2b0fe0f000)
commit 77ecca5e16a1e5adae8a4286e5734e201b1d4e3e
Author: Jeremy Allison <[email protected]>
Date: Fri Sep 2 14:59:31 2011 -0700
Part 1 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set
(Invalid argument)
Remove the code I added for bug "6878 - Cannot change ACL's inherit flag".
It is incorrect
and causes the POSIX ACL ACL_USER_OBJ duplication.
(cherry picked from commit cd5d9a5c8fb0660835d60479fb783e4f7cae743f)
commit 29a438c9eb6d13bfa8cb780c59d05e65961cd52e
Author: Jeremy Allison <[email protected]>
Date: Fri Oct 7 08:56:59 2011 -0700
Fix bug #8458 - IE9 on Windows 7 cannot download files to samba 3.5.11 share
Handle the SECINFO_LABEL flag in the same way as Win2k3.
(cherry picked from commit 4b26ffd1ea430b2cc612884c8ba194498a64932b)
commit 5679f815af20a0108a39668e035c08e829b213aa
Author: Jeremy Allison <[email protected]>
Date: Fri Sep 30 13:35:59 2011 -0700
Fix bug #8493 - DFS breaks zip file extracting unless "follow symlinks =
no" set
If a client sends a mangled name as part of a DFS path, use the
post-mangled name for the pathname walk, not the mangled name.
Autobuild-User: Jeremy Allison <[email protected]>
Autobuild-Date: Sat Oct 1 00:45:59 CEST 2011 on sn-devel-104
(cherry picked from commit 149875f887287dbbf016d2252962b023b0bae967)
(cherry picked from commit 1ed1b19b2eeda3217d03d66d4220abd871b03cb4)
commit 7cba110fa575080a5c4b499d6c29b447350ae37c
Author: Karolin Seeger <[email protected]>
Date: Wed Sep 28 20:17:42 2011 +0200
s3-docs: Remove "experimental" label on VFS ACL modules
in the documentation also (bug #8494).
Karolin
(cherry picked from commit bd5d9d9fba23ea585b701c41ec27482a0076729e)
(cherry picked from commit 4c060730723dcf4a2d6e2833361fa4737bc9a29b)
commit d14dc20f71e1b52433496032dea0c9cf8e8d7ef2
Author: Jeremy Allison <[email protected]>
Date: Fri May 20 14:43:50 2011 -0700
Patch for bug #8156 - net ads join fails to use the user's kerberos ticket.
If kerberos_get_realm_from_hostname() or
kerberos_get_default_realm_from_ccache() fails due to
a misconfigured krb5.conf, try the "realm =" from smb.conf as a fallcback
before going back to
NTLMSSP (which we'll do anyway).
(cherry picked from commit ccab9efb653cfacdd357986f7a8a85c17df7abbb)
(cherry picked from commit f16e4cc11fd4f195da7c4f0de13d0bb23e5b79d1)
commit c32c7911d60614b000773a562a70cc0690d60610
Author: Pierre Carrier <[email protected]>
Date: Tue Sep 14 16:43:39 2010 -0700
Allows changing the maximum number of simultaneous clients in winbindd
through an smb.conf option.
Signed-off-by: Jeremy Allison <[email protected]>
Fix bug #8186 (Allows changing the maximum number of simultaneous clients in
winbindd through an smb.conf option).
(cherry picked from commit b6f691ede0a80aaf7226b6862120b5052e63668d)
commit 6d85cc6fbc2c34b4b17a155dd4f0ca5ab33f4084
Author: Günther Deschner <[email protected]>
Date: Wed Sep 28 18:12:49 2011 +0200
s3-winbind: Fix bug 7888 -- deal with buggy 3.0 based PDCs.
Guenther
(cherry picked from commit d7f0de06c119abad609f87121a8a4fb533e82747)
commit 8dbbb542da415ed1d26e5a567482b0a6b7b32cb8
Author: Günther Deschner <[email protected]>
Date: Thu Aug 4 17:28:05 2011 +0200
s3-nmbd: fix memleak in create_listen_fdset().
Guenther
The last 2 patches address bug #8491 (fix some coverity issues).
(cherry picked from commit 702443500268ceb4dd3e0d3a1a130bca465be266)
commit 8ea73cedf27010900b70553ca100799e64963595
Author: Stefan Metzmacher <[email protected]>
Date: Thu Dec 2 00:40:01 2010 +0100
libcli/auth: let spnego_write_mech_types() check the asn1_load() return
metze
Autobuild-User: Stefan Metzmacher <[email protected]>
Autobuild-Date: Tue Dec 7 18:23:41 CET 2010 on sn-devel-104
(cherry picked from commit 363b81899401f01de11ddbd8036b55a472806b38)
commit d01176ccca9440b977ec6aa32eaa8c6148c95362
Author: David Disseldorp <[email protected]>
Date: Tue Sep 27 17:46:29 2011 -0700
Fix bug 8480 - acl_xattr can free an invalid pointer if no blob is loaded.
(cherry picked from commit 62b9ad45e27bb6a2af22aa9ee133ed6075abc62b)
commit 504b8175bd1742c9c15aff72967e1e8bc297826d
Author: Günther Deschner <[email protected]>
Date: Wed Sep 21 17:47:27 2011 +0200
s3-netapi: allow to use default krb5 credential cache for libnetapi users.
Guenther
(cherry picked from commit 52e5c8002f1ccd417eaf56f0c1c9abb9d13bb7d6)
commit a911587b7b1a40aa9c1609291f36f5b02cd3da50
Author: Günther Deschner <[email protected]>
Date: Wed Sep 21 17:28:58 2011 +0200
s3-libnet: allow to use default krb5 ccache in libnet_Join/libnet_Unjoin.
We force using a MEMORY ccache though in the wkssvc server.
Guenther
(cherry picked from commit 01f30f5c3e690956f1bd85006c88b6d79e63a1c7)
commit 3ff0dc42874ece5240d6121e512ab81f3f2d0114
Author: Volker Lendecke <[email protected]>
Date: Mon Dec 6 21:01:35 2010 +0100
s3: Fix bug 7844: Race in winbind
If a child dies, the parent process right away closes the socket.
This is wrong, with tevent we still have events pending. This works
fine for epoll but does not for at least the FreeBSD select variant.
Tevent sticks a closed socket into the select masks. This then
returns an error EBADF. When this happens, the parent winbind dies
instead of forking a new child.
This moves the socket close from the SIGCHLD cleanup function to
the socket receiver. I could not reproduce the parent death anymore
and it did not create an obvious fd leak.
(cherry picked from commit da08c8ac7cf9e2833c39e7ef39caafa4ab34424d)
commit a1ea93395614cf234f8fb31bbc3904e8cd45aa86
Author: Stefan Metzmacher <[email protected]>
Date: Mon Sep 12 12:10:54 2011 -0700
s3:libsmb: check the wct of the incoming SMBnegprot responses
metze
Fix bug #8452 (negprot reply needs to check vwv vector length).
The corresponding commit in master is
85332eb1c721d585e1a33101bddafdca4073e10f.
(cherry picked from commit c5bf8ac4ee60fe808a2593a5ece12e8bfad5695b)
commit 3479f1f948c7068d8aafa65e2cb16e4cf1da9c16
Author: Volker Lendecke <[email protected]>
Date: Thu Aug 25 20:13:09 2011 +0200
v3-5-test: Fix getent group if trusted domains are not reachable
Fix bug #8420 (wb_group_members: non-resistance against garbage).
(cherry picked from commit 126d343580e7ba6465cfdf60ea60958cbe98b242)
commit b5c3fa15409016d081b9831ad597e26e55a549a3
Author: Jeremy Allison <[email protected]>
Date: Mon Aug 29 16:53:04 2011 -0700
Fix bug Bug 8422 - Infinite loop in ACL module code.
Missing assignment means this loop will never terminate. Need to be applied
to 3.5.x and 3.6.1.
(cherry picked from commit 4db250449dda30e3ffa05c8918e0cf39cbacc5d8)
commit d43d24dae9781d38bf6df8a96e63d967f1ca4ef7
Author: Jeremy Allison <[email protected]>
Date: Sat Aug 20 20:49:59 2011 +0200
s3-vfs: Fix vfs_chown_fsp.
Fix bug #8370 (vfs_chown_fsp broken -- returns in the wrong directory).
(cherry picked from commit 0b1ce3f177b75e146fdae0b5531c54dedffada1d)
commit 1cf18bdf160ae5b137797c3b21327e7f2e642879
Author: Volker Lendecke <[email protected]>
Date: Thu Aug 11 16:52:22 2011 +0200
s3: Fix bug 8360
OS/2 sends an unexpected write&x/read&x chain
(cherry picked from commit 2aca833308049d005c647aabcd9d894f59698ef4)
(cherry picked from commit b42573acbf7eee1580eaceb1b9c57ddbbe3a2532)
commit c484e1ac1eeea3e224b957554cc1dd6ef85a2643
Author: Volker Lendecke <[email protected]>
Date: Fri Jul 29 15:43:46 2011 -0700
s3: Add a fallback for missing open&x support in OS/X Lion
The last 4 patches address bug #8338 (MAC Lion - smbclient "Open AndX
Request->STATUS_NOT_SUPPORTED).
(cherry picked from commit 8e9dfd04fac5353fb12270647209ac45d19a1ad2)
commit 5e876f697ef6a76925927faf6f77871832c129f0
Author: Volker Lendecke <[email protected]>
Date: Fri Jul 29 15:03:03 2011 -0700
s3: Make map_open_params_to_ntcreate() available in lib/
(cherry picked from commit aa0c6eb76a6e16652a2ef46560eaffb881792cf6)
commit cefea3b85ac151068c3e252a72976e3053a63459
Author: Volker Lendecke <[email protected]>
Date: Fri Jul 29 14:41:10 2011 -0700
s3: Make is_executable() available in lib/
(cherry picked from commit 612361bdcaf4256eb54913423e127d0628b35356)
commit f9af343eb84a17cf2a3e31a084d4cdd6d196cb68
Author: Volker Lendecke <[email protected]>
Date: Fri Jul 29 14:26:58 2011 -0700
s3: We only need base_name in map_open_params_to_ntcreate
(cherry picked from commit 1fa4b369d2fabbf34cda576d91d8aa9baa4e8b68)
commit a7cac5ff9fe4ef025d09f3f243d9a77afd4ddd27
Author: Björn Jacke <[email protected]>
Date: Thu Aug 4 16:25:08 2011 +0200
s3/swat: use strlcat instead of strncat to fix build on old Linux distros
SLES 9's glibc for example had weird macros where the use of strncat
resulted
in the use of strcat which we don't allow.
Signed-off-by: Stefan Metzmacher <[email protected]>
Autobuild-User: Björn Jacke <[email protected]>
Autobuild-Date: Thu Aug 4 17:50:24 CEST 2011 on sn-devel-104
(cherry picked from commit d3b4d75364210e2d2a4a1cd806f28b0021f22909)
Fix bug #8362 (build issue on old glibc systems).
(cherry picked from commit 87fa72a5202fe3780d4a61289bf755027cd078f4)
(cherry picked from commit 552ccc6588b0744ae9b3731b1406749baea03d5a)
commit f226e03a19a2337c189e91791d66cf3356ce23f1
Author: Stefan Metzmacher <[email protected]>
Date: Fri Aug 5 19:48:38 2011 +0200
s3:web/swat: use strtoll() instead of atoi/atol/atoll
This is more portable, as we have a strtoll replacement
in lib/replace.
metze
Autobuild-User: Stefan Metzmacher <[email protected]>
Autobuild-Date: Sat Aug 6 11:55:45 CEST 2011 on sn-devel-104
(cherry picked from commit a6be0820d09b3f3eabfbb5f4356add303aa8a494)
Fix bug #8347 (CVE-2011-2522 regression for HP-UX, AIX and OSF).
(cherry picked from commit 34b8765d894f13490fab734ee91bd53e235d10e6)
commit a994e195520afc62edbf06ae542d0b20007a967c
Author: Karolin Seeger <[email protected]>
Date: Sun Aug 7 20:50:50 2011 +0200
WHATSNEW: Fix typo.
Karolin
(cherry picked from commit 921e87af9c531e1cf88cd207ffee16320dd9a81d)
-----------------------------------------------------------------------
Summary of changes:
README.contributing | 120 ++++++++++++
WHATSNEW.txt | 64 ++++++-
docs-xml/manpages-3/vfs_acl_tdb.8.xml | 4 -
docs-xml/manpages-3/vfs_acl_xattr.8.xml | 4 -
docs-xml/manpages-3/vfs_aio_fork.8.xml | 86 +++++++++
docs-xml/smbdotconf/winbind/winbindmaxclients.xml | 14 ++
libcli/auth/spnego_parse.c | 4 +
librpc/gen_ndr/ndr_security.c | 1 +
librpc/gen_ndr/security.h | 1 +
librpc/idl/security.idl | 1 +
source3/Makefile.in | 2 +-
source3/client/client.c | 7 +-
source3/include/local.h | 3 -
source3/include/proto.h | 17 +-
source3/include/smb.h | 1 +
source3/lib/netapi/netapi.c | 10 +-
source3/lib/util.c | 158 ++++++++++++++++
source3/libnet/libnet_join.c | 30 ---
source3/libsmb/cliconnect.c | 47 ++++-
source3/libsmb/clifile.c | 91 +++++++--
source3/locking/locking.c | 8 +
source3/modules/vfs_acl_common.c | 17 ++-
source3/nmbd/nmbd_packets.c | 2 +
source3/param/loadparm.c | 13 ++-
source3/rpc_server/srv_wkssvc_nt.c | 4 +
source3/smbd/filename.c | 39 +++-
source3/smbd/msdfs.c | 13 +-
source3/smbd/nttrans.c | 25 +++
source3/smbd/open.c | 170 +-----------------
source3/smbd/posix_acls.c | 202 ++++++---------------
source3/smbd/process.c | 23 ++-
source3/smbd/reply.c | 8 +-
source3/smbd/statcache.c | 11 +-
source3/smbd/trans2.c | 24 ++-
source3/web/swat.c | 27 ++-
source3/winbindd/wb_group_members.c | 8 +-
source3/winbindd/winbindd.c | 8 +-
source3/winbindd/winbindd_dual.c | 12 +-
source3/winbindd/winbindd_pam.c | 50 ++++--
39 files changed, 851 insertions(+), 478 deletions(-)
create mode 100644 README.contributing
create mode 100644 docs-xml/manpages-3/vfs_aio_fork.8.xml
create mode 100644 docs-xml/smbdotconf/winbind/winbindmaxclients.xml
Changeset truncated at 500 lines:
diff --git a/README.contributing b/README.contributing
new file mode 100644
index 0000000..2d72f0c
--- /dev/null
+++ b/README.contributing
@@ -0,0 +1,120 @@
+How to contribute a patch to Samba
+----------------------------------
+
+Simple, just make the code change, and email it as either a "diff -u"
+change, or as a "git format-patch" change against the original source
+code to [email protected], or attach it to a bug report at
+http://bugzilla.samba.org
+
+For larger code changes, breaking the changes up into a set of simple
+patches, each of which does a single thing, are much easier to review.
+Patch sets like that will most likely have an easier time being merged
+into the Samba code than large single patches that make lots of
+changes in one large diff.
+
+Ownership of the contributed code
+---------------------------------
+
+Samba is a project with distributed copyright ownership, which means
+we prefer the copyright on parts of Samba to be held by individuals
+rather than corporations if possible. There are historical legal
+reasons for this, but one of the best ways to explain it is that it's
+much easier to work with individuals who have ownership than corporate
+legal departments if we ever need to make reasonable compromises with
+people using and working with Samba.
+
+We track the ownership of every part of Samba via git, our source code
+control system, so we know the provenance of every piece of code that
+is committed to Samba.
+
+So if possible, if you're doing Samba changes on behalf of a company
+who normally owns all the work you do please get them to assign
+personal copyright ownership of your changes to you as an individual,
+that makes things very easy for us to work with and avoids bringing
+corporate legal departments into the picture.
+
+If you can't do this we can still accept patches from you owned by
+your employer under a standard employment contract with corporate
+copyright ownership. It just requires a simple set-up process first.
+
+We use a process very similar to the way things are done in the Linux
+kernel community, so it should be very easy to get a sign off from
+your corporate legal department. The only changes we've made are to
+accommodate the licenses we use, which are GPLv3 and LGPLv3 (or later)
+whereas the Linux kernel uses GPLv2.
+
+The process is called signing.
+
+How to sign your work
+---------------------
+
+Once you have permission to contribute to Samba from
+your employer, simply email a copy of the following text
+from your corporate email address to [email protected]
+
+------------------------------------------------------------
+Samba Developer's Certificate of Origin. Version 1.0
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+ have the right to submit it under the appropriate
+ version of the GNU General Public License; or
+
+(b) The contribution is based upon previous work that, to the best
+ of my knowledge, is covered under an appropriate open source
+ license and I have the right under that license to submit that
+ work with modifications, whether created in whole or in part
+ by me, under the GNU General Public License, in the
+ appropriate version; or
+
+(c) The contribution was provided directly to me by some other
+ person who certified (a) or (b) and I have not modified
+ it.
+
+(d) I understand and agree that this project and the
+ contribution are public and that a record of the
+ contribution (including all metadata and personal
+ information I submit with it, including my sign-off) is
+ maintained indefinitely and may be redistributed
+ consistent with the Samba Team's policies and the
+ requirements of the GNU GPL where they are relevant.
+
+(e) I am granting this work to this project under the terms of both
+ the GNU General Public License and the GNU Lesser General Public
+ License as published by the Free Software Foundation; either version
+ 3 of these Licenses, or (at the option of the project) any later
+ version.
+
+ http://www.gnu.org/licenses/gpl-3.0.html
+ http://www.gnu.org/licenses/lgpl-3.0.html
+------------------------------------------------------------
+
+We will maintain a copy of that email as a record that you have the
+rights to contribute code to Samba under the required licenses whilst
+working for the company where the email came from.
+
+Then when sending in a patch via the normal mechanisms described
+above, add a line that states:
+
+Signed-off-by: Random J Developer <[email protected]>
+
+using your real name and the email address you sent the original email
+you used to send the Samba Developer's Certificate of Origin to us
+(sorry, no pseudonyms or anonymous contributions.)
+
+That's it ! Such code can then quite happily contain changes that have
+copyright messages such as :
+
+ (C) Example Corporation.
+
+and can be merged into the Samba codebase in the same way as patches
+from any other individual. You don't need to send in a copy of the
+Samba Developer's Certificate of Origin for each patch, or inside each
+patch. Just the sign-off message is all that is required once we've
+received the initial email.
+
+Have fun and happy Samba hacking !
+
+The Samba Team.
+
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 367f0a3..4805d17 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,6 +1,6 @@
==============================
Release Notes for Samba 3.5.12
- , 2011
+ November 2, 2011
==============================
@@ -8,13 +8,69 @@ This is the latest stable release of Samba 3.5.
Major enhancements in Samba 3.5.12 include:
-o
+o Fix race condition in Winbind (bug 7844).
+o The VFS ACL modules are no longer experimental but production-ready.
+
Changes since 3.5.11:
--------------------
-o
+o Jeremy Allison <[email protected]>
+ * BUG 7509: smb_acl_to_posix: ACL is invalid for set (Invalid argument).
+ * BUG 7551: Return error of cli_push when 'put - /some/file' is used.
+ * BUG 8156: 'net ads join' fails to use the user's kerberos ticket.
+ * BUG 8370: Fix vfs_chown_fsp.
+ * BUG 8422: Fix infinite loop in ACL module code.
+ * BUG 8443: Be smarter about setting default permissions when a
ACL_USER_OBJ
+ isn't given.
+ * BUG 8458: IE9 on Windows 7 cannot download files to samba 3.5.11 share.
+ * BUG 8493: DFS breaks zip file extracting unless "follow symlinks = no"
+ set.
+ * BUG 8507: Make smbd correctly honor the "force create mode" bits from a
+ cifsfs create.
+ * BUG 8541: Fix readlink() on Linux clients if the symlink target is
+ outside of the share.
+ * BUG 8542: smbclient posix_open command fails to return correct info on
+ open file.
+
+
+o Pierre Carrier <[email protected]>
+ * BUG 8186: Allow changing the maximum number of simultaneous clients in
+ Winbind through an smb.conf option.
+
+
+o Günther Deschner <[email protected]>
+ * BUG 7465: Fix 'net ads join -k' when KRB5CCNAME is not set.
+ * BUG 7888: Deal with buggy 3.0 based PDCs.
+ * BUG 8491: Fix some coverity issues.
+
+
+o David Disseldorp <[email protected]>
+ * BUG 8480: acl_xattr can free an invalid pointer if no blob is loaded.
+
+
+o Björn Jacke <[email protected]>
+ * BUG 8256: Add man vfs_aio_fork.
+ * BUG 8362: Fix SWAT build issue on old glibc systems.
+ * BUG 8531: Make DSO_EXPORTS_CMD more portable.
+
+
+o Volodymyr Khomenko <[email protected]>
+ * BUG 8515: Disallow "." in can_set_delete_on_close().
+
+
+o Volker Lendecke <[email protected]>
+ * BUG 7844: Fix race condition in Winbind.
+ * BUG 8338: Add a fallback for missing open&x support in OS/X Lion.
+ * BUG 8420: Fix getent group if trusted domains are not reachable.
+
+
+o Stefan Metzmacher <[email protected]
+ * BUG 8347: Fix regression on HP-UX, AIX and OSF introduced by the fix for
+ CVE-2011-2522.
+ * BUG 8452: Check the wct of the incoming SMBnegprot responses in libsmb.
+ * BUG 8491: Fix some coverity issues.
######################################################################
@@ -51,7 +107,7 @@ This is the latest stable release of Samba 3.5.
Major enhancements in Samba 3.5.11 include:
o Fix access to Samba shares when Windows security patch KB2536276 is
installed
- (bug #7460).
+ (bug #8238).
o Fix Winbind panics if verify_idpool() fails (bug #8253).
diff --git a/docs-xml/manpages-3/vfs_acl_tdb.8.xml
b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
index 027ac86..6f3d84b 100644
--- a/docs-xml/manpages-3/vfs_acl_tdb.8.xml
+++ b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
@@ -40,10 +40,6 @@
<filename>$LOCKDIR/file_ntacls.tdb</filename>.
</para>
- <para>Please note that this module is
- <emphasis>experimental</emphasis>!
- </para>
-
<para>This module is stackable.</para>
</refsect1>
diff --git a/docs-xml/manpages-3/vfs_acl_xattr.8.xml
b/docs-xml/manpages-3/vfs_acl_xattr.8.xml
index b22a621..7e751ad 100644
--- a/docs-xml/manpages-3/vfs_acl_xattr.8.xml
+++ b/docs-xml/manpages-3/vfs_acl_xattr.8.xml
@@ -44,10 +44,6 @@
</command>).
</para>
- <para>Please note that this module is
- <emphasis>experimental</emphasis>!
- </para>
-
<para>This module is stackable.</para>
</refsect1>
diff --git a/docs-xml/manpages-3/vfs_aio_fork.8.xml
b/docs-xml/manpages-3/vfs_aio_fork.8.xml
new file mode 100644
index 0000000..6eeebef
--- /dev/null
+++ b/docs-xml/manpages-3/vfs_aio_fork.8.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant
V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc";>
+<refentry id="vfs_aio_fork.8">
+
+<refmeta>
+ <refentrytitle>vfs_aio_fork</refentrytitle>
+ <manvolnum>8</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">3.5</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+ <refname>vfs_aio_fork</refname>
+ <refpurpose>implement async I/O in Samba vfs</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>vfs objects = aio_fork</command>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This VFS module is part of the
+ <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+ <para>The <command>aio_fork</command> VFS module enables async
+ I/O for Samba on platforms where the system level Posix AIO
+ interface is insufficient. Posix AIO can suffer from severe
+ limitations. For example, on some Linux versions the
+ real-time signals that it uses are broken under heavy load.
+ Other systems only allow AIO when special kernel modules are
+ loaded or only allow a certain system-wide amount of async
+ requests being scheduled. Systems based on glibc (most Linux
+ systems) only allow a single outstanding request per file
+ descriptor. </para>
+
+ <para>To work around all these limitations, the aio_fork module
+ was written. It uses forked helper processes instead of the
+ internal Posix AIO interface to create asynchronousity for
+ read and write calls. It has no parameters, it will create
+ helper processes when async requests come in as needed. Idle
+ helper processes will be removed every 30 seconds.
+ </para>
+
+ <para>This module is stackable.</para>
+
+</refsect1>
+
+
+<refsect1>
+ <title>EXAMPLES</title>
+
+ <para>Straight forward use:</para>
+
+<programlisting>
+ <smbconfsection name="[cooldata]"/>
+ <smbconfoption name="path">/data/ice</smbconfoption>
+ <smbconfoption name="vfs objects">aio_fork</smbconfoption>
+</programlisting>
+
+</refsect1>
+
+<refsect1>
+ <title>VERSION</title>
+
+ <para>This man page is correct for version 3.5.0 of the Samba suite.
+ </para>
+</refsect1>
+
+<refsect1>
+ <title>AUTHOR</title>
+
+ <para>The original Samba software and related utilities
+ were created by Andrew Tridgell. Samba is now developed
+ by the Samba Team as an Open Source project similar
+ to the way the Linux kernel is developed.</para>
+
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/smbdotconf/winbind/winbindmaxclients.xml
b/docs-xml/smbdotconf/winbind/winbindmaxclients.xml
new file mode 100644
index 0000000..ae49e45
--- /dev/null
+++ b/docs-xml/smbdotconf/winbind/winbindmaxclients.xml
@@ -0,0 +1,14 @@
+<samba:parameter name="winbind max clients"
+ context="G"
+ type="integer"
+ advanced="1" developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";>
+<description>
+ <para>This parameter specifies the maximum number of clients
+ the <citerefentry><refentrytitle>winbindd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry> daemon can connect with.
+ </para>
+</description>
+
+<value type="default">200</value>
+</samba:parameter>
diff --git a/libcli/auth/spnego_parse.c b/libcli/auth/spnego_parse.c
index 86b083d..27ede1b 100644
--- a/libcli/auth/spnego_parse.c
+++ b/libcli/auth/spnego_parse.c
@@ -380,6 +380,10 @@ bool spnego_write_mech_types(TALLOC_CTX *mem_ctx,
{
struct asn1_data *asn1 = asn1_init(mem_ctx);
+ if (asn1 == NULL) {
+ return false;
+ }
+
/* Write mechTypes */
if (mech_types && *mech_types) {
int i;
diff --git a/librpc/gen_ndr/ndr_security.c b/librpc/gen_ndr/ndr_security.c
index ceeba76..b59eb19 100644
--- a/librpc/gen_ndr/ndr_security.c
+++ b/librpc/gen_ndr/ndr_security.c
@@ -1042,6 +1042,7 @@ _PUBLIC_ void ndr_print_security_secinfo(struct ndr_print
*ndr, const char *name
ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_GROUP",
SECINFO_GROUP, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_DACL",
SECINFO_DACL, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_SACL",
SECINFO_SACL, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_LABEL",
SECINFO_LABEL, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"SECINFO_UNPROTECTED_SACL", SECINFO_UNPROTECTED_SACL, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"SECINFO_UNPROTECTED_DACL", SECINFO_UNPROTECTED_DACL, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_PROTECTED_SACL",
SECINFO_PROTECTED_SACL, r);
diff --git a/librpc/gen_ndr/security.h b/librpc/gen_ndr/security.h
index 297ba18..9bf01b9 100644
--- a/librpc/gen_ndr/security.h
+++ b/librpc/gen_ndr/security.h
@@ -358,6 +358,7 @@ struct security_token {
#define SECINFO_GROUP ( 0x00000002 )
#define SECINFO_DACL ( 0x00000004 )
#define SECINFO_SACL ( 0x00000008 )
+#define SECINFO_LABEL ( 0x00000010 )
#define SECINFO_UNPROTECTED_SACL ( 0x10000000 )
#define SECINFO_UNPROTECTED_DACL ( 0x20000000 )
#define SECINFO_PROTECTED_SACL ( 0x40000000 )
diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl
index 44a1712..fa8f6ec 100644
--- a/librpc/idl/security.idl
+++ b/librpc/idl/security.idl
@@ -448,6 +448,7 @@ interface security
SECINFO_GROUP = 0x00000002,
SECINFO_DACL = 0x00000004,
SECINFO_SACL = 0x00000008,
+ SECINFO_LABEL = 0x00000010,
SECINFO_UNPROTECTED_SACL = 0x10000000,
SECINFO_UNPROTECTED_DACL = 0x20000000,
SECINFO_PROTECTED_SACL = 0x40000000,
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 425aa2b..d1a8780 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -28,7 +28,7 @@ SHLD=@SHLD@
LIB_PATH_VAR=@LIB_PATH_VAR@
## Dynamic shared libraries build settings
-DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed
's/@SHLIBEXT@\(.[0-9]\{1,\}\)\{0,1\}$$/@SYMSEXT@/'`
+DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed
's:\.@SHLIBEXT@[\.0-9]*$$:.@SYMSEXT@:'`
DSO_EXPORTS=@DSO_EXPORTS@
SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
diff --git a/source3/client/client.c b/source3/client/client.c
index e1952b5..cf43171 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1668,6 +1668,7 @@ static int do_put(const char *rname, const char *lname,
bool reput)
&state);
if (!NT_STATUS_IS_OK(status)) {
d_fprintf(stderr, "cli_push returned %s\n", nt_errstr(status));
+ rc = 1;
}
if (!NT_STATUS_IS_OK(cli_close(targetcli, fnum))) {
@@ -1700,7 +1701,7 @@ static int do_put(const char *rname, const char *lname,
bool reput)
if (f == x_stdin) {
cli_shutdown(cli);
- exit(0);
+ exit(rc);
}
return rc;
@@ -2304,8 +2305,8 @@ static int cmd_posix_open(void)
}
if (!NT_STATUS_IS_OK(cli_posix_open(targetcli, targetname,
O_CREAT|O_RDWR, mode, &fnum))) {
- if (!NT_STATUS_IS_OK(cli_posix_open(targetcli, targetname,
O_CREAT|O_RDONLY, mode, &fnum))) {
- d_printf("posix_open file %s: for read/write fnum
%d\n", targetname, fnum);
+ if (NT_STATUS_IS_OK(cli_posix_open(targetcli, targetname,
O_CREAT|O_RDONLY, mode, &fnum))) {
+ d_printf("posix_open file %s: for readonly fnum %d\n",
targetname, fnum);
} else {
d_printf("Failed to open file %s. %s\n", targetname,
cli_errstr(cli));
}
diff --git a/source3/include/local.h b/source3/include/local.h
index d65cc00..6153a2a 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -240,9 +240,6 @@
/* Number in seconds for winbindd to wait for the mutex. Make this 2 * smbd
wait time. */
#define WINBIND_SERVER_MUTEX_WAIT_TIME (( ((NUM_CLI_AUTH_CONNECT_RETRIES) *
((CLI_AUTH_TIMEOUT)/1000)) + 5)*2)
-/* Max number of simultaneous winbindd socket connections. */
-#define WINBINDD_MAX_SIMULTANEOUS_CLIENTS 200
-
/* Buffer size to use when printing backtraces */
#define BACKTRACE_STACK_SIZE 64
diff --git a/source3/include/proto.h b/source3/include/proto.h
index d560ee5..2e04ca1 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1242,6 +1242,13 @@ const char *strip_hostname(const char *s);
bool tevent_req_poll_ntstatus(struct tevent_req *req,
struct tevent_context *ev,
NTSTATUS *status);
+bool is_executable(const char *fname);
+bool map_open_params_to_ntcreate(const char *smb_base_fname,
+ int deny_mode, int open_func,
+ uint32 *paccess_mask,
+ uint32 *pshare_mode,
+ uint32 *pcreate_disposition,
+ uint32 *pcreate_options);
/* The following definitions come from lib/util_file.c */
@@ -4257,6 +4264,7 @@ int lp_smb_encrypt(int );
char lp_magicchar(const struct share_params *p );
int lp_winbind_cache_time(void);
int lp_winbind_reconnect_delay(void);
+int lp_winbind_max_clients(void);
const char **lp_winbind_nss_info(void);
int lp_algorithmic_rid_base(void);
int lp_name_cache_timeout(void);
@@ -6346,6 +6354,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
const char *orig_path,
struct smb_filename **smb_fname,
--
Samba Shared Repository
