[SCM] Samba Shared Repository - branch v3-5-stable updated
Karolin Seeger
kseeger at samba.org
Mon Jan 25 03:33:10 MST 2010
The branch, v3-5-stable has been updated
via 9956693... WHATSNEW: Update changes since 3.5.0rc1.
via adcd1a8... s3: Fix bug 7052: "DFS broken on AIX (maybe others)" (cherry picked from commit c531d00ab4444db19ff6ba4c60ebdcc8319949c6) (cherry picked from commit f21796955e7aa2e84a1c810612f2fdee2bde611c)
via e172365... s3:pdb_ldap: Fix large paged search.
via f13a516... s3-docs: Fix typos.
via e9a4ae7... s3 net/i18n: Update .po files (cherry picked from commit add4edcd063591839111d474543ceea847413f6f)
via e088c3e... s3 net: Fix compile warnings (cherry picked from commit 66de52c4f4527ef43cfaf11c55616ec7602cce85)
via 5fd4066... s3 net/i18n: update .po files (cherry picked from commit 6d33bb25e1aab72bb3e12a0824a758bacba32672)
via a94daec... s3 net/i18n: Use only one spelling for "Usage:" (cherry picked from commit 09bc13728fc76cf784914a4066c793c297e50cff)
via f1bc012... s3 net: Fix compile error with WITH_DNS_UPDATES
via 8aed2be... s3/net: split up some printable stings to ease i18n
via bb7070d... Ñ•3/i18n/de: fix typo (cherry picked from commit fb7a4621134b9054f33ccb48d7d8c1e4e4960b9a)
via 8dd3a22... s3/i18n/de: improve some German translations (cherry picked from commit c3ef7a3d96763719de1df679d50fb8a00d1f7391)
via 798a172... net: Add German translation, specially for the command listing
via f06c47c... WHATSNEW: Update release notes.
via 4e65f5e... s3:pdb_ldap: restore Samba 3.0.x behavior and use the first "uid" value.
via 89c572a... s3:smbldap: add smbldap_talloc_first_attribute()
via 6a82616... s3-docs: Adapt version number in man vfs_scannedonly.
via dd61c89... s3-docs: Add man page for vfs_scannedonly.
via ab0032d... s3: Fix a crash in libsmbclient used against the OpenSolaris CIFS server
via 5e83ccd... Fix bug 7045 - Bad (non memory copying) interfaces in smbc_setXXXX calls.
via 60de807... Modification of fix for bug 6876 - Delete of an object whose parent folder does not have delete rights fails even if the delete right is set on the object
via 7fb2c6f... Fix bug #6876 - Delete of an object whose parent folder does not have delete rights fails even if the delete right is set on the object.
via 70975e2... WHATSNEW: Start 3.5.0rc2 release notes.
via 06cacc7... VERSION: Raise version number up to 3.5.0rc2.
via 2be6999... s3-libsmbclient: Fix crash bug in SMBC_parse_path().
via 73710b5... docs: fix xml tag in the pdbedit manpage
via a075b47... s3-docs: mention -K option in pdbedit manpage.
via b8bda6b... Fix bug #7036 - net rpc getsid fails in hardened windows environments.
via 9d33a91... s3-lanman: Allow a level2 descriptor for a level1 NetShareGetInfo
via b906f49... Part 4 of bug #7028 - include scannedonly VFS module
via f2c873f... Fix two uses of strncat -> strlcat. Ensure proper use of strncpy when setting socket name.
via 3b9fe52... s3: Lift the version of the scannedonly VFS module (cherry picked from commit 2d4dda0688d5c88fb73ae17db970afe9d0f77f6a) (cherry picked from commit f692d27c9edc187ebdc080ff71fc5df24b607c55)
via 2cf7a4f... Bug #7028 part1
via a587879... Fix bug #7033 - SMBrmdir call always returns true, even on failure to delete a directory.
via 946a865... s3: Fix a winbind segfault in "trusted_domains"
via e5d8180... Fix bug #7034 - vfs_cap causes signal 11 (SIGSEGV) (cherry picked from commit ca847952054f5bbde1d40ad4260589b6fcc9721d) (cherry picked from commit dbbe7c5949f2e5728577e1a1146c0b72b1b482c0)
via 3476f79... s3: Fix a segfault in winbindd_dual_ccache_ntlm_auth()
via 6d79f25... Re-fix bug 5202 - cannot change ACLs on writable file with "dos filemode=yes"
via e685d43... s3: Lock down some srvsvc calls according to what w2k3 seems to do (cherry picked from commit ea7d2995f383e183ef4d8a21705a343581e71f4a)
from b097212... WHATSNEW: Update changes.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable
- Log -----------------------------------------------------------------
commit 9956693e89c11f04366453801778e069049ed55f
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 25 11:28:46 2010 +0100
WHATSNEW: Update changes since 3.5.0rc1.
Karolin
(cherry picked from commit b3f2d34b54bc06e7d1d0c47e89dc8f2dcc782890)
commit adcd1a81b1d21e32824edd083bf8e053613992a3
Author: William Jojo <w.jojo at hvcc.edu>
Date: Thu Jan 21 14:21:03 2010 +0100
s3: Fix bug 7052: "DFS broken on AIX (maybe others)"
(cherry picked from commit c531d00ab4444db19ff6ba4c60ebdcc8319949c6)
(cherry picked from commit f21796955e7aa2e84a1c810612f2fdee2bde611c)
commit e17236586cc836f997666c6c8a9633940152c006
Author: Volker Lendecke <vl at samba.org>
Date: Mon May 18 16:04:04 2009 +0200
s3:pdb_ldap: Fix large paged search.
Fix bug #6981 (Paged Search with DirX LDAP server broken).
(cherry picked from commit 0a3b576c0a4298cbe600ad8943e401e3a0639359)
(cherry picked from commit 155fb985ec1c487c457e7962417cf9e137597ff6)
commit f13a51638053b84787ea390664375183d80652e8
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Jan 20 13:34:50 2010 +0100
s3-docs: Fix typos.
Thanks to the Debian samba package maintainers
<pkg-samba-maint at lists.alioth.debian.org> for providing the patch!
Fix bug #7017 (Typos and spelling errors in manpages).
Karolin
(cherry picked from commit e1e6b19acff6d8ba3b70c3ab474a85de8b6f6a6c)
(cherry picked from commit eaa10cfec3c389c79ac3c43f7ec1596015a9b8e1)
commit e9a4ae7fd3335fa1032ecd355b50450baad08b18
Author: Kai Blin <kai at samba.org>
Date: Tue Jan 19 14:48:12 2010 +0100
s3 net/i18n: Update .po files
(cherry picked from commit add4edcd063591839111d474543ceea847413f6f)
Part 9/9 of a fix for bug #7039 (German translation of net is not complete).
(cherry picked from commit 9effcc4426d8c11be539598cffb0485761633659)
commit e088c3efccc6820db2262740e0452ffd926d4a9b
Author: Kai Blin <kai at samba.org>
Date: Tue Jan 19 11:43:54 2010 +0100
s3 net: Fix compile warnings
(cherry picked from commit 66de52c4f4527ef43cfaf11c55616ec7602cce85)
Part 8/9 of a fix for bug #7039 (German translation of net is not complete).
(cherry picked from commit c9ffceedfd1bb8a21ade44e33eebc7e7426b1e84)
commit 5fd40667c73f38203fa1b26a0323eb5b2d5c7203
Author: Kai Blin <kai at samba.org>
Date: Tue Jan 19 10:06:26 2010 +0100
s3 net/i18n: update .po files
(cherry picked from commit 6d33bb25e1aab72bb3e12a0824a758bacba32672)
Part 7/9 of a fix for bug #7039 (German translation of net is not complete).
(cherry picked from commit 5d47fdf980ec16dd22020b15d82ae127663fcb9c)
commit a94daecc47ab74dcf6d9970e6ec676af261f0bf7
Author: Kai Blin <kai at samba.org>
Date: Tue Jan 19 09:23:42 2010 +0100
s3 net/i18n: Use only one spelling for "Usage:"
(cherry picked from commit 09bc13728fc76cf784914a4066c793c297e50cff)
Part 6/9 of a fix for bug #7039 (German translation of net is not complete).
(cherry picked from commit 611df88507ca2d69f258ea804e2b4fc4ebe420e3)
commit f1bc0127daed72e8d1f00a4114acd388aa050b27
Author: Kai Blin <kai at samba.org>
Date: Tue Jan 19 09:36:55 2010 +0100
s3 net: Fix compile error with WITH_DNS_UPDATES
bd3c922e2bc1a163efc1d8c9cb59578bebb79616 introduced a compile-time error
when building with WITH_DNS_UPDATES.
(cherry picked from commit 28b512f904cee5a79aefd0aca2d839dbe37e5519)
Part 5/9 of a fix for bug #7039 (German translation of net is not complete).
(cherry picked from commit a00de540e13afe4772ccc4756364f91f31cc8951)
commit 8aed2bea152db828edf00f7f7355bc5772cd4f8d
Author: Björn Jacke <bj at sernet.de>
Date: Mon Jan 18 23:39:19 2010 +0100
s3/net: split up some printable stings to ease i18n
If we put strings like "Usage:" into separate _() macros and not the whole
"Usage:..." string we can cover much more messages by only one single
translation. The drawback is that the message in the sources looks less pretty.
(cherry picked from commit bd3c922e2bc1a163efc1d8c9cb59578bebb79616)
Part 4/9 of a fix for bug #7039 (German translation of net is not complete).
(cherry picked from commit f70106f13a2722b958f95c6d6209788d06c69a07)
commit bb7070d881738c8beec8bd55f8e385424f5039d2
Author: Björn Jacke <bj at sernet.de>
Date: Mon Jan 18 22:07:55 2010 +0100
Ñ•3/i18n/de: fix typo
(cherry picked from commit fb7a4621134b9054f33ccb48d7d8c1e4e4960b9a)
Part 3/9 of a fix for bug #7039 (German translation of net is not complete).
(cherry picked from commit 5731d96a7a0a499cf984aa4f6bf91fbccd8d7ce2)
commit 8dd3a22165e5580ffdb064429a3561e9132b447c
Author: Björn Jacke <bj at sernet.de>
Date: Mon Jan 18 23:25:41 2010 +0100
s3/i18n/de: improve some German translations
(cherry picked from commit c3ef7a3d96763719de1df679d50fb8a00d1f7391)
Part 2/9 of a fix for bug #7039 (German translation of net is not complete).
(cherry picked from commit 45403b2dede2f52524622c189fc789868ca4c633)
commit 798a17232177194f0adfc675388407ce4324ec48
Author: André Hentschel <nerv at dawncrow.de>
Date: Thu Jan 14 19:49:18 2010 +0100
net: Add German translation, specially for the command listing
Signed-off-by: Kai Blin <kai at samba.org>
(cherry picked from commit 46842a68618b4c9faba25580e68a286b97f9337e)
Part 1/9 of a fix for bug #7039 (German translation of net is not complete).
(cherry picked from commit 87a729791c896af8b64451e68cc2bf9f43ce9344)
commit f06c47c4374d04f4e68df44d5d5cbc404b8ca0d8
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Jan 19 12:39:49 2010 +0100
WHATSNEW: Update release notes.
Karolin
(cherry picked from commit da2bf2e1e8eb2dc686ab998ef359653e74e211d8)
commit 4e65f5ed8bf8dbc9a484c3fce069cfb597630b7b
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jan 5 13:30:42 2010 +0100
s3:pdb_ldap: restore Samba 3.0.x behavior and use the first "uid" value.
See bug #6157 for more details.
metze
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 25806f43ddee7e2653e907eea2c6fcc075960fa1)
(cherry picked from commit ac224452b94865db346ed68dc517f84d40e6303c)
(cherry picked from commit 13fd42e84025dd0427ec8454c56f07869a3af962)
commit 89c572aae897f0e13adb89a1e20c7b8094740ec6
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jan 5 13:30:19 2010 +0100
s3:smbldap: add smbldap_talloc_first_attribute()
metze
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit c992127f8a96c37940a6d298c7c6859c47f83d9b)
(cherry picked from commit 915b7552b71904baf6a452bdc1649e76d8286a14)
(cherry picked from commit 009877922e65e5872218e83fba0d0f2a230dec2e)
commit 6a82616d755e3835d64d278aa9a6d48fa0622b9b
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 18 11:44:10 2010 +0100
s3-docs: Adapt version number in man vfs_scannedonly.
Karolin
(cherry picked from commit deb72f6fe3b027d27c7390f387ef4ae009b18106)
commit dd61c8965ae7efe9826da710baa2bde67feb3958
Author: Olivier Sessink <oliviersessink at gmail.com>
Date: Mon Jan 18 11:40:33 2010 +0100
s3-docs: Add man page for vfs_scannedonly.
Fix bug #7028.
(cherry picked from commit 3fb359aa5698e393f37765ab279b5a4ba366f965)
(cherry picked from commit a26389a222a6aa0bd13a16f546cabcc16bb8329b)
commit ab0032deaa76aa7e9eaacee0fb054191b9550350
Author: Volker Lendecke <vl at samba.org>
Date: Sat Jan 16 13:31:44 2010 +0100
s3: Fix a crash in libsmbclient used against the OpenSolaris CIFS server
A user has sent me a sniff where the OpenSolaris CIFS server returns "32" in
totalentries, but the array in ctr only contains 15 entries. Look at the right
delimiter for walking the array.
Fix bug #7046 (libsmbclient crash against OpenSolaris CIFS server).
(cherry picked from commit 33d7c3b5831a76d1c65a585ae57e51dd2eba4935)
commit 5e83ccd7ed865ed90cd2e975c983058dcb71eaeb
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jan 15 17:45:21 2010 -0800
Fix bug 7045 - Bad (non memory copying) interfaces in smbc_setXXXX calls.
In smbc_free_context libsmbclient just called free() on the string options
so it assumes the callers have malloced them before setting them via smbc_set
calls.
Change to correctly malloc/free string options to the library.
Protect against SMB_STRDUP of null.
Contains 2d41b1ab78639abe4ae030ff482573f464564dd7 and
f85b6ee90b88c7f7b2a92c8a5f3e2ebe59c1087b from master.
Jeremy
(cherry picked from commit e579de0c473d505c75bfeb8c583188e998666a8c)
commit 60de807f98aec9b1dcbf3455f17988b0637540d7
Author: Jeremy Allison <jra at samba.org>
Date: Sat Jan 16 17:03:06 2010 -0800
Modification of fix for bug 6876 - Delete of an object whose parent folder does not have delete rights fails even if the delete right is set on the object
Suggested by Volker. Reduce the surface area of the
become_root() unbecome_root() code to reduce the chance
of errors.
Jeremy.
(cherry picked from commit 98a495f1e674b7562a3d8b5dfc958ee95d256896)
(cherry picked from commit 8c8412fa88f752797abebd940d488b1c09009d96)
commit 7fb2c6feb0936d1ba0e0cf4f2f878bda59799147
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jan 12 16:04:44 2010 -0800
Fix bug #6876 - Delete of an object whose parent folder does not have delete rights fails even if the delete right is set on the object.
Final fix for the vfs_acl_xattr and vfs_acl_tdb code.
Ensure we can delete a file even if the underlying POSIX
permissions don't allow it, if the Windows permissions do.
Jeremy.
(cherry picked from commit 47c1d9b39f292772e8d8f7a737ddff6c8bdfdeae)
(cherry picked from commit eec11c0d2ba61aa2f86a100064b3a9de3f56bb7d)
commit 70975e2dd2deda052ca2f5e0bdb1a4af6b6cf29a
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jan 15 15:56:38 2010 +0100
WHATSNEW: Start 3.5.0rc2 release notes.
Karolin
(cherry picked from commit 54b98a39dcd6937203dffef3a5cd432a862737ca)
commit 06cacc759efcc26dd086c9d8508878b996d6f903
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jan 15 15:30:06 2010 +0100
VERSION: Raise version number up to 3.5.0rc2.
Karolin
(cherry picked from commit fa12a98dfdf336a4ee2f653fa0cffb4a4b1ccfe9)
commit 2be69995cfc566e5bfd62c2c185c353a59f8bd08
Author: Günther Deschner <gd at samba.org>
Date: Thu Jan 14 19:34:26 2010 +0100
s3-libsmbclient: Fix crash bug in SMBC_parse_path().
Patch from Tim Waugh <twaugh at redhat.com>.
This resolves https://bugzilla.redhat.com/show_bug.cgi?id=552658
LIBSMBCLIENT-OPENDIR torture test checks this as well.
Guenther
(cherry picked from commit e635b0074c55e0376495abe940355aa7b04f0b70)
Fix bug #7043 (SIGSEGV in "SMBC_parse_path").
(cherry picked from commit 19c78aa6d5462a6e91f7d65d52c2f4378d80eecc)
commit 73710b59fc35ac3fdd25c8e3a441da5e8fab34b0
Author: Michael Adam <obnox at samba.org>
Date: Tue Jan 12 12:29:14 2010 +0100
docs: fix xml tag in the pdbedit manpage
Michael
(cherry picked from commit 3b58b2ac39a91c0c9f074abf079f700c7e886841)
Signed-off-by: Michael Adam <obnox at samba.org>
Fix bug #7041.
(cherry picked from commit 73df1d5e6a6eb09df5392656bd9ad5b94a3933a2)
commit a075b47d85b65a3ab45e7233ea7c8cc48303cbb9
Author: Günther Deschner <gd at samba.org>
Date: Fri Jan 8 10:38:46 2010 +0100
s3-docs: mention -K option in pdbedit manpage.
Guenther
(cherry picked from commit 9bdd3d6c1b1aec536d87fb2e2d4e8495b3c88ee6)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 2812d7547b87d60509a30e2955acc78084ed7466)
commit b8bda6b10fd425839ad5f6f1c926f96b92cdc746
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 14 15:39:30 2010 -0800
Fix bug #7036 - net rpc getsid fails in hardened windows environments.
Fix suggested by Dave.Daugherty at Centrify.com.
(cherry picked from commit 6653cc43233381a941cdd85550f04b087fe880ff)
(cherry picked from commit d1f67394ce70342a35fba280e533c76bc9775f9d)
commit 9d33a91b9780cb6e6cfaa6e7cad903680e5c489d
Author: Giovanni Bajo <rasky at develer.com>
Date: Mon Jan 11 22:18:40 2010 +0100
s3-lanman: Allow a level2 descriptor for a level1 NetShareGetInfo
Windows seems to allow this
http://lists.samba.org/archive/samba-technical/2009-November/068116.html
has a dump of this.
(cherry picked from commit d75d14f8de0b1fe36028e605c9453631d9cd70bc)
Fix bug #7029 (NetShareEnum: disable sanity check for better compatibility with
Windows).
(cherry picked from commit 91a59704421d2c0a3c23cb936323fc1f9ba17dc0)
commit b906f49f910a2e563320531b16369d6851c202e7
Author: Olivier Sessink <oliviersessink at gmail.com>
Date: Thu Jan 14 12:13:14 2010 -0800
Part 4 of bug #7028 - include scannedonly VFS module
Fix some issues with handling names ending in '/'.
(cherry picked from commit 3c42e11ff398d0307a480d49191aae3bf9869cd9)
(cherry picked from commit af2a075f2c8feaf4961c25693ec973fb7ae6d524)
commit f2c873f82ffd03668c781a6829fc1dc604c9f6a5
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jan 12 21:18:36 2010 -0800
Fix two uses of strncat -> strlcat. Ensure proper use of strncpy when setting socket name.
Jeremy.
(cherry picked from commit ed457e07b9bdc0acda9dc52307d8bc2118f32f06)
(cherry picked from commit dff5d81d12da94707d586ab8842c96b05fa713a1)
commit 3b9fe5299a7d7a3958d7e9c40e33625cad0059b4
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jan 12 22:58:51 2010 +0100
s3: Lift the version of the scannedonly VFS module (cherry picked from commit 2d4dda0688d5c88fb73ae17db970afe9d0f77f6a)
(cherry picked from commit f692d27c9edc187ebdc080ff71fc5df24b607c55)
commit 2cf7a4fc44ce82d8ed2562507852198bbadc0faa
Author: Olivier Sessink <oliviersessink at gmail.com>
Date: Wed Jan 13 14:53:27 2010 -0800
Bug #7028 part1
s3: Add the "scannedonly" vfs virus scanner interface module
(cherry picked from commit e04a7325766fbf35ec45bb431481b79277d89f8e)
commit a587879ba07c2fda4e601f1a7f6cf147c64162e6
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 13 14:36:37 2010 -0800
Fix bug #7033 - SMBrmdir call always returns true, even on failure to delete a directory.
There is a codepath missing to propagate back error returns from the rmdir
POSIX call inside close_directory when delete on close is set. This means doing
an rmdir on a Windows command line will always report success, even when the
directory was not deleted. This fix adds that codepath back into Samba.
(This fix contains both ce8dcbe91ba0252140a0e4f84ea4bc746259ddde and
105f876eb447e6839b9b19c2d264c4a168cf0cc9 from master).
Jeremy.
(cherry picked from commit fd04e3a2b74dbd31c7574355c73779626c10070e)
commit 946a86556de4bde25fbb4b4503e513166c46b53c
Author: Volker Lendecke <vl at samba.org>
Date: Wed Jan 13 12:20:26 2010 +0100
s3: Fix a winbind segfault in "trusted_domains"
We have to initialize domain->backend by calling "get_cache" before doing a
query
Thanks to Christian Ambach to find this :-)
(cherry picked from commit 026b23062eeee23dffeb627800b3cb6f55d89ad6)
Fix bug #7037.
(cherry picked from commit 3b9cdab89672576ddfe6f7c2be54169fb4dd7634)
commit e5d8180217c9bd851626a42c5d724224cbebe15c
Author: SASAJIMA Toshihiro <sasajima_t at jp.fujitsu.com>
Date: Tue Jan 12 21:43:23 2010 -0800
Fix bug #7034 - vfs_cap causes signal 11 (SIGSEGV) (cherry picked from commit ca847952054f5bbde1d40ad4260589b6fcc9721d)
(cherry picked from commit dbbe7c5949f2e5728577e1a1146c0b72b1b482c0)
commit 3476f790df380924b740d0777bc9f56733927432
Author: Volker Lendecke <vl at samba.org>
Date: Sat Jan 9 20:22:00 2010 +0100
s3: Fix a segfault in winbindd_dual_ccache_ntlm_auth()
ntlmssp_update allocates the reply_blob as a child of ntlmssp_state. This means
with ntlmss_end() it will be gone. winbindd_dual_ccache_ntlm_auth used the blob
after the ntlmssp_end().
(cherry picked from commit 43c841b6bd92e987109df81b6b8a2b85f21b0181)
Addresses bug #7027 (winbindd crash in winbindd_dual_ccache_ntlm_auth due to
freed memory reference.)
(cherry picked from commit 26faf1262fc2f0fa2d8c2874150852ac36951162)
commit 6d79f2553419d411b7a73187945a63b0dc168be6
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jan 8 10:17:46 2010 -0800
Re-fix bug 5202 - cannot change ACLs on writable file with "dos filemode=yes"
This bug re-occurred for 3.3.x and above.
The reason is that to change a NT ACL we now have to open the file requesting
WRITE_DAC and WRITE_OWNER access. The mapping from POSIX "w" to NT permissions
in posix_acls doesn't add these bits when "dos filemode = yes", so even though
the permission or owner change would be allowed by the POSIX ACL code, the
NTCreateX call fails with ACCESS_DENIED now we always check NT permissions
first.
Added in the mapping from "w" to WRITE_DAC and WRITE_OWNER access.
Jeremy.
(cherry picked from commit d7713d11a6dc2d66c820d7496bc45eb5fe527fbf)
(cherry picked from commit e687a20d60144af2cb459231fb6a699f2533ce9d)
commit e685d4380741cfba55f1449c308b492fcf5e48d1
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jan 7 11:47:09 2010 +0100
s3: Lock down some srvsvc calls according to what w2k3 seems to do
(cherry picked from commit ea7d2995f383e183ef4d8a21705a343581e71f4a)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 82 +-
docs-xml/manpages-3/ntlm_auth.1.xml | 2 +-
docs-xml/manpages-3/pdbedit.8.xml | 1 +
docs-xml/manpages-3/smbd.8.xml | 2 +-
docs-xml/manpages-3/vfs_scannedonly.8.xml | 243 ++
docs-xml/manpages-3/winbindd.8.xml | 2 +-
docs-xml/smbdotconf/browse/preferredmaster.xml | 2 +-
docs-xml/smbdotconf/protocol/largereadwrite.xml | 2 +-
.../smbdotconf/winbind/winbindnormalizenames.xml | 2 +-
source3/Makefile.in | 5 +
source3/VERSION | 2 +-
source3/configure.in | 3 +-
source3/include/smb.h | 1 +
source3/include/smbldap.h | 3 +
source3/lib/smbldap.c | 34 +
source3/libsmb/libsmb_context.c | 26 +-
source3/libsmb/libsmb_dir.c | 2 +-
source3/libsmb/libsmb_path.c | 2 +-
source3/libsmb/libsmb_setget.c | 15 +-
source3/locale/net/de.po | 3696 +++++++++-----------
source3/locale/pam_winbind/de.po | 12 +-
source3/locking/locking.c | 3 +
source3/modules/vfs_acl_common.c | 124 +
source3/modules/vfs_acl_tdb.c | 3 +-
source3/modules/vfs_acl_xattr.c | 2 +
source3/modules/vfs_cap.c | 3 +-
source3/modules/vfs_scannedonly.c | 990 ++++++
source3/passdb/pdb_ldap.c | 3 +-
source3/rpc_server/srv_srvsvc_nt.c | 21 +
source3/smbd/close.c | 11 +-
source3/smbd/lanman.c | 4 +-
source3/smbd/posix_acls.c | 4 +
source3/smbd/reply.c | 8 +-
source3/utils/net.c | 11 +-
source3/utils/net_ads.c | 134 +-
source3/utils/net_ads_gpo.c | 41 +-
source3/utils/net_afs.c | 4 +-
source3/utils/net_cache.c | 36 +-
source3/utils/net_conf.c | 46 +-
source3/utils/net_dom.c | 12 +-
source3/utils/net_eventlog.c | 9 +-
source3/utils/net_groupmap.c | 44 +-
source3/utils/net_idmap.c | 24 +-
source3/utils/net_lookup.c | 19 +-
source3/utils/net_rap.c | 10 +-
source3/utils/net_registry.c | 56 +-
source3/utils/net_rpc.c | 272 +-
source3/utils/net_rpc_audit.c | 30 +-
source3/utils/net_rpc_registry.c | 62 +-
source3/utils/net_rpc_rights.c | 29 +-
source3/utils/net_rpc_samsync.c | 19 +-
source3/utils/net_rpc_service.c | 66 +-
source3/utils/net_rpc_sh_acct.c | 16 +-
source3/utils/net_rpc_shell.c | 3 +-
source3/utils/net_sam.c | 104 +-
source3/utils/net_status.c | 16 +-
source3/utils/net_time.c | 22 +-
source3/utils/net_util.c | 2 +-
source3/winbindd/winbindd_cache.c | 7 +-
source3/winbindd/winbindd_ccache_access.c | 2 +-
tests/readlink.c | 2 +-
61 files changed, 3966 insertions(+), 2447 deletions(-)
create mode 100644 docs-xml/manpages-3/vfs_scannedonly.8.xml
create mode 100644 source3/modules/vfs_scannedonly.c
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 26205e5..e71ffce 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,9 +1,9 @@
================================
- Release Notes for Samba 3.5.0rc1
- January 7, 2010
+ Release Notes for Samba 3.5.0rc2
+ January 26, 2010
================================
-This is the first release candidate of Samba 3.5. This is *not*
+This is the second release candidate of Samba 3.5. This is *not*
intended for production environments and is designed for testing
purposes only. Please report any defects via the Samba bug reporting
system at https://bugzilla.samba.org/.
@@ -12,6 +12,7 @@ Major enhancements in Samba 3.5.0 include:
General changes:
o Add support for full Windows timestamp resolution
+o The Using Samba HTML book has been removed.
Protocol changes:
o Experimental implementation of SMB2
@@ -23,6 +24,9 @@ Winbind changes:
o Major refactoring
o Asynchronous
+VFS modules:
+o New vfs_scannedonly module has been added.
+
General changes:
================
@@ -31,6 +35,9 @@ Support for full Windows timestamp resolution has been added. This effectively
makes us use Windows' full 100ns timestamp resolution if supported by the
kernel (2.6.22 and higher) and the glibc (2.6 and higher).
+The Using Samba HTML book has been removed from the Samba tarball.
+It is still available at http://www.samba.org/samba/docs/using_samba/toc.html.
+
Protocol changes
================
@@ -49,7 +56,14 @@ Winbind changes
===============
The Winbind daemon has been refactored internally to be asynchronous. The new
-Winbind will not be blocked by running 'wbinfo -g' or 'wbinfo -u'.
+Winbind will not be blocked by running 'getent group' or 'getent passwd'.
+
+VFS modules
+===========
+
+A new VFS module "scannedonly" has been added. This is a filter that
+talks to an antivirus-engine and stores whether a file is clean or not.
+Users do only see clean files on their filesystem.
######################################################################
@@ -97,6 +111,66 @@ o Stefan Metzmacher <metze at samba.org>
* Implement the new SMB2 protocol (experimental).
+Changes since 3.5.0rc1
+----------------------
+
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 5202: Fix changing of ACLs on writable file with "dos filemode=yes".
+ * BUG 6876: Fix deletion of an object whose parent folder does not have delete
+ rights fails even if the delete right is set on the object in
+ vfs_acl_xattr and vfs_acl_tdb.
+ * BUG 7033: Fix SMBrmdir error message when deleting a directory fails.
+ * BUG 7036: Fix 'net rpc getsid' in hardened Windows environments.
+ * BUG 7045: Fix bad (non memory copying) interfaces in smbc_setXXXX calls.
+
+
+o Giovanni Bajo <rasky at develer.com>
+ * BUG 7029: Disable sanity check in NetShareEnum for better compatibility
+ with Windows.
+
+
+o Kai Blin <kai at samba.org>
+ * BUG 7039: Fix compile error with WITH_DNS_UPDATE. Update .po files.
+
+
+o Günther Deschner <gd at samba.org>
+ * BUG 7043: Fix crash bug in libsmbclient.
+
+
+o André Hentschel <nerv at dawncrow.de>
+ * BUG 7039: Complete German translation of 'net'.
+
+
+o Björn Jacke <bj at sernet.de>
+ * BUG 7039: Improve some German translations in 'net'.
+
+
+o William Jojo <w.jojo at hvcc.edu>
+ * BUG 7052: Fix DFS on AIX.
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 6981: Fix large paged search with DirX LDAP servers.
+ * BUG 7027: Fix a segfault in winbindd_dual_ccache_ntlm_auth().
+ * BUG 7037: Fix a Winbind segfault in "trusted_domains".
+ * BUG 7046: Fix libsmbclient crash against OpenSolaris CIFS server.
+ * Lock down some srvsvc calls according to what w2k3 seems to do.
+
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 6157: Restore Samba 3.0.x behavior and use the first "uid" value in
+ pdb_ldap.
+
+
+o SASAJIMA Toshihiro <sasajima_t at jp.fujitsu.com>
+ * BUG 7034: Fix segfault in vfs_cap.
+
+
+o Olivier Sessink <oliviersessink at gmail.com>
+ * BUG 7028: Add new scannedonly VFS module.
+
+
Changes since 3.5.0pre2
-----------------------
diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages-3/ntlm_auth.1.xml
index 608331a..3ffc354 100644
--- a/docs-xml/manpages-3/ntlm_auth.1.xml
+++ b/docs-xml/manpages-3/ntlm_auth.1.xml
@@ -35,7 +35,7 @@
users using NT/LM authentication. It returns 0 if the users is authenticated
successfully and 1 if access was denied. ntlm_auth uses winbind to access
the user and authentication data for a domain. This utility
- is only indended to be used by other programs (currently
+ is only intended to be used by other programs (currently
<ulink url="http://www.squid-cache.org/">Squid</ulink>
and <ulink url="http://download.samba.org/ftp/unpacked/lorikeet/trunk/mod_ntlm_winbind/">mod_ntlm_winbind</ulink>)
</para>
diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages-3/pdbedit.8.xml
index eaafb97..d139ff5 100644
--- a/docs-xml/manpages-3/pdbedit.8.xml
+++ b/docs-xml/manpages-3/pdbedit.8.xml
@@ -32,6 +32,7 @@
<arg choice="opt">-h homedir</arg>
<arg choice="opt">-i passdb-backend</arg>
<arg choice="opt">-I domain</arg>
+ <arg choice="opt">-K</arg>
<arg choice="opt">-L </arg>
<arg choice="opt">-m</arg>
<arg choice="opt">-M SID|RID</arg>
diff --git a/docs-xml/manpages-3/smbd.8.xml b/docs-xml/manpages-3/smbd.8.xml
index 1062f28..87b9e28 100644
--- a/docs-xml/manpages-3/smbd.8.xml
+++ b/docs-xml/manpages-3/smbd.8.xml
@@ -120,7 +120,7 @@
<listitem><para>If this parameter is specified it causes the
server to run "interactively", not as a daemon, even if the
server is executed on the command line of a shell. Setting this
- parameter negates the implicit deamon mode when run from the
+ parameter negates the implicit daemon mode when run from the
command line. <command>smbd</command> also logs to standard
output, as if the <command>-S</command> parameter had been
given.
diff --git a/docs-xml/manpages-3/vfs_scannedonly.8.xml b/docs-xml/manpages-3/vfs_scannedonly.8.xml
new file mode 100644
index 0000000..12e59d7
--- /dev/null
+++ b/docs-xml/manpages-3/vfs_scannedonly.8.xml
@@ -0,0 +1,243 @@
+<?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_scannedonly.8">
+
+<refmeta>
+ <refentrytitle>vfs_scannedonly</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_scannedonly</refname>
+ <refpurpose>Ensures that only files that have been scanned for viruses are
+ visible and accessible to the end user.</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>vfs objects = scannedonly</command>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This VFS module is part of the
+ <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry> suite.</para>
+
+ <para>The <command>vfs_scannedonly</command> VFS module ensures that
+ only files that have been scanned for viruses are visible and accessible
+ to the end user. If non-scanned files are found an anti-virus scanning
+ daemon is notified. The anti-virus scanning daemon is not part of the
+ Samba suite.
+ </para>
+
+ <para>Scannedonly comes in two parts: a samba vfs module and (one or
+ more) daemons. The daemon scans files. If a certain file is clean,
+ a second file is created with prefix <filename>.scanned:</filename>.
+ The Samba module simply looks if such a <filename>.scanned:</filename>
+ file exists, and is newer than the pertinent file. If this is the case,
+ the file is shown to the user. If this is not the case, the file is not
+ returned in a directory listing (configurable), and cannot be opened
+ (configurable). The Samba vfs module will notify the daemon to scan
+ this file.
+ </para>
+
+ <para>So what happens for the user in the default configuration. The
+ first time a directory is listed, it shows files as 'file is being
+ scanned for viruses, but after the first time all files are shown.
+ There is a utility scannedonly_prescan that can help you to prescan
+ all directories. When new files are written the daemon is notified
+ immediately after the file is complete.
+ </para>
+
+ <para>If a virus is found by the daemon, a file with a warning message
+ is created in the directory of the user, a warning is sent to the logs,
+ and the file is renamed to have prefix <filename>.virus:</filename>.
+ Files with the <filename>.virus:</filename> prefix are never shown to
+ the user and all access is denied.
+ </para>
+
+ <para>This module is stackable.</para>
+
+</refsect1>
+
+<refsect1>
+ <title>CONFIGURATION</title>
+
+ <para><command>vfs_scannedonly</command> relies on a anti-virus scanning
+ daemon that listens on the scannedonly socket (unix domain socket or UDP
+ socket).
+ </para>
+</refsect1>
+
+<refsect1>
+ <title>OPTIONS</title>
+
+ <variablelist>
+ <varlistentry>
+ <term>scannedonly:domain_socket = True </term>
+ <listitem>
+ <para>Whether to use a unix domain socket or not (false reverts
+ to use udp)
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>scannedonly:socketname = /var/lib/scannedonly/scan</term>
+ <listitem>
+ <para>The location of the unix domain socket to connect to</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>scannedonly:portnum = 2020</term>
+ <listitem>
+ <para>The udp port number to connect to
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term>scannedonly:scanhost = localhost</term>
+ <listitem>
+ <para>
+ When using UDP the host that runs the scanning daemon (this host
+ needs access to the files!)
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term>scannedonly:show_special_files = True</term>
+ <listitem>
+ <para>
+ Whether sockets, devices and fifo's (all not scanned for
+ viruses) should be visible to the user
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term>scannedonly:rm_hidden_files_on_rmdir = True</term>
+ <listitem>
+ <para>
+ Whether files that are not visible (<filename>.scanned:</filename>
+ files, <filename>.failed:</filename> files and <filename>.virus:
+ </filename> files) should be deleted if the user tries to remove
+ the directory. If false, the user will get the "directory is not
+ empty" error.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term>scannedonly:hide_nonscanned_files = True</term>
+ <listitem>
+ <para>
+ If false, all non-scanned files are visible in directory listings.
+ If such files are found in a directory listing the scanning daemon
+ is notified that scanning is required. Access to non-scanned files
+ is still denied (see scannedonly:allow_nonscanned_files).
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term>scannedonly:scanning_message = is being scanned for
+ viruses</term>
+ <listitem>
+ <para>
+ If non-scanned files are hidden
+ (if scannedonly:hide_nonscanned_files = True), a fake 0 byte file
+ is shown. The filename is the original filename with the message
+ as suffix.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term>scannedonly:recheck_time_open = 50</term>
+ <listitem>
+ <para>
+ If a non-scanned file is opened, the vfs module will wait
+ recheck_tries_open times for recheck_time_open milliseconds for
+ the scanning daemon to create a <filename>.scanned:</filename>
+ file. For small files that are scanned by the daemon within the
+ time (tries * time) the behavior will be just like on-access
+ scanning.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term>scannedonly:recheck_tries_open = 100</term>
+ <listitem>
+ <para>
+ See recheck_time_open.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term>scannedonly:recheck_time_readdir = 50</term>
+ <listitem>
+ <para>
+ If a non-scanned file is in a directory listing the vfs module
+ notifies the daemon (once for all files that need scanning in
+ that directory), and waits recheck_tries_readdir times for
+ recheck_time_readdir milliseconds. Only used when
+ hide_nonscanned_files is false.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term>scannedonly:recheck_tries_readdir = 20</term>
+ <listitem>
+ <para>
+ See recheck_time_readdir.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term>scannedonly:allow_nonscanned_files = False</term>
+ <listitem>
+ <para>
+ Allow access to non-scanned files. The daemon is notified,
+ however, and special files such as <filename>.scanned:</filename>
+ files. <filename>.virus:</filename> files and
+ <filename>.failed:</filename> files are not listed.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+</refsect1>
+
+<refsect1>
+ <title>EXAMPLES</title>
+
+ <para>Enable anti-virus scanning:</para>
+<programlisting>
+ <smbconfsection name="[homes]"/>
+ <smbconfoption name="vfs objects">scannedonly</smbconfoption>
+ <smbconfoption name="scannedonly:hide_nonscanned_files">False</smbconfoption>
+</programlisting>
+
+</refsect1>
+
+<refsect1>
+ <title>CAVEATS</title>
+
+ <para>This is not true on-access scanning. However, it is very fast
+ for files that have been scanned already.
+ </para>
+</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. Scannedonly was
+ developed for Samba by Olivier Sessink. 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/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml
index f773e4e..91ac2c8 100644
--- a/docs-xml/manpages-3/winbindd.8.xml
+++ b/docs-xml/manpages-3/winbindd.8.xml
@@ -53,7 +53,7 @@
<para> The Name Service Switch allows user
and system information to be obtained from different databases
services such as NIS or DNS. The exact behaviour can be configured
- throught the <filename>/etc/nsswitch.conf</filename> file.
+ through the <filename>/etc/nsswitch.conf</filename> file.
Users and groups are allocated as they are resolved to a range
of user and group ids specified by the administrator of the
Samba system.</para>
diff --git a/docs-xml/smbdotconf/browse/preferredmaster.xml b/docs-xml/smbdotconf/browse/preferredmaster.xml
index edddae8..9dcffb4 100644
--- a/docs-xml/smbdotconf/browse/preferredmaster.xml
+++ b/docs-xml/smbdotconf/browse/preferredmaster.xml
@@ -16,7 +16,7 @@
parameter is used in conjunction with <smbconfoption name="domain master">yes</smbconfoption>, so that
<command moreinfo="none">nmbd</command> can guarantee becoming a domain master.
</para>
-
+
<para>
Use this option with caution, because if there are several hosts (whether Samba servers, Windows 95 or NT)
that are preferred master browsers on the same subnet, they will each periodically and continuously attempt
diff --git a/docs-xml/smbdotconf/protocol/largereadwrite.xml b/docs-xml/smbdotconf/protocol/largereadwrite.xml
index 12be741..0b4158d 100644
--- a/docs-xml/smbdotconf/protocol/largereadwrite.xml
+++ b/docs-xml/smbdotconf/protocol/largereadwrite.xml
@@ -7,7 +7,7 @@
<para>This parameter determines whether or not
<citerefentry><refentrytitle>smbd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry> supports the new 64k
- streaming read and write varient SMB requests introduced with
+ streaming read and write variant SMB requests introduced with
Windows 2000. Note that due to Windows 2000 client redirector bugs
this requires Samba to be running on a 64-bit capable operating
system such as IRIX, Solaris or a Linux 2.4 kernel. Can improve
diff --git a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
index ba71686..3bcdeca 100644
--- a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
@@ -20,7 +20,7 @@
version. Please refer to the manpage for the configured
idmap and nss_info plugin for the specifics on how to configure
name aliasing for a specific configuration. Name aliasing takes
- precendence (and is mutually exclusive) over the whitespace
+ precedence (and is mutually exclusive) over the whitespace
replacement mechanism discussed previsouly.
</para>
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 66f51e2..cdf2d38 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -739,6 +739,7 @@ VFS_ONEFS_SHADOW_COPY_OBJ = modules/vfs_onefs_shadow_copy.o modules/onefs_shadow
PERFCOUNT_ONEFS_OBJ = modules/perfcount_onefs.o
PERFCOUNT_TEST_OBJ = modules/perfcount_test.o
VFS_DIRSORT_OBJ = modules/vfs_dirsort.o
+VFS_SCANNEDONLY_OBJ = modules/vfs_scannedonly.o
PLAINTEXT_AUTH_OBJ = auth/pampass.o auth/pass_check.o
@@ -2819,6 +2820,10 @@ bin/dirsort. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_DIRSORT_OBJ)
@echo "Building plugin $@"
@$(SHLD_MODULE) $(VFS_DIRSORT_OBJ)
+bin/scannedonly. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_SCANNEDONLY_OBJ)
+ @echo "Building plugin $@"
+ @$(SHLD_MODULE) $(VFS_SCANNEDONLY_OBJ)
+
#########################################################
## IdMap NSS plugins
diff --git a/source3/VERSION b/source3/VERSION
index 3addc63..f9eb732 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -56,7 +56,7 @@ SAMBA_VERSION_PRE_RELEASE=
# e.g. SAMBA_VERSION_RC_RELEASE=1 #
# -> "3.0.0rc1" #
########################################################
-SAMBA_VERSION_RC_RELEASE=1
+SAMBA_VERSION_RC_RELEASE=2
--
Samba Shared Repository
More information about the samba-cvs
mailing list