[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 17113c3 vfs_catia: new version of the manual page for samba-3.6.x via ddb98ca vfs_catia: add my copyright via ad8fe62 vfs_catia: fix the translation to vfs_translate_to_windows via 58ac0d3 vfs_catia: add debug class for that module from 797c7ff selftest: Skip tests failing on ext4 fs. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 17113c33a77a257560f33dbb35286ae20250a8f5 Author: Guenter Kukkukk ku...@samba.org Date: Sat Mar 9 04:45:15 2013 +0100 vfs_catia: new version of the manual page for samba-3.6.x well, i was not aware of the change ./docs-xml/manpages-3/ ./docs-xml/manpages/ in samba-4.0.x Signed-off-by: Guenter Kukkukk ku...@samba.org The last 4 patches address bug #9701 - vfs_catia is not working anymore (due to a former regression). commit ddb98cae501020e2fc02523b4083d16dc44d8908 Author: Guenter Kukkukk ku...@samba.org Date: Fri Mar 1 00:58:05 2013 +0100 vfs_catia: add my copyright Signed-off-by: Guenter Kukkukk ku...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit ad8fe6215f68d2aaf143b44888b75498cfd03e6d Author: Guenter Kukkukk ku...@samba.org Date: Wed Feb 27 05:50:52 2013 +0100 vfs_catia: fix the translation to vfs_translate_to_windows THANKS to an IRC user (Raimund ?) who asked for a char mapping possibility. I suggested vfs_catia - but it did not work! Hopefully now it will. :-) Signed-off-by: Guenter Kukkukk ku...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit 58ac0d30aba4a0c0aab2a358b42e17d8c0e896ca Author: Guenter Kukkukk ku...@samba.org Date: Wed Feb 27 05:34:05 2013 +0100 vfs_catia: add debug class for that module Signed-off-by: Guenter Kukkukk ku...@samba.org Reviewed-by: Jeremy Allison j...@samba.org --- Summary of changes: docs-xml/manpages-3/vfs_catia.8.xml | 66 +- source3/modules/vfs_catia.c | 35 --- 2 files changed, 94 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/vfs_catia.8.xml b/docs-xml/manpages-3/vfs_catia.8.xml index f1368a0..a786ecd 100644 --- a/docs-xml/manpages-3/vfs_catia.8.xml +++ b/docs-xml/manpages-3/vfs_catia.8.xml @@ -31,18 +31,31 @@ paraThe Catia CAD package commonly creates filenames that use characters that are illegal in CIFS filenames. The - commandvfs_catia/command VFS module implements a fixed character + commandvfs_catia/command VFS module implements a character mapping so that these files can be shared with CIFS clients. /para paraThis module is stackable./para + paraUp to samba version 3.4.x a fixed character mapping was used. + The invalid windows characters \ / : * ? lt; gt; | and the blank + character were mapped in a hardcoded way. + /para + + paraStarting with samba-3.5.0 a more flexible mapping was introduced. + The new parameter catia:mappings now specifies the mapping on a char by char + basis using the notation: unix hex char 0x.. : windows hex char 0x.. + Multiple character mappings are separated by a comma. + /para + + /refsect1 refsect1 titleEXAMPLES/title + paraSamba versions up to 3.4.x:/para paraMap Catia filenames on the [CAD] share:/para programlisting @@ -51,12 +64,60 @@ smbconfoption name=vfs objectscatia/smbconfoption /programlisting + paraSamba versions 3.5.0 and later:/para + paraMap Catia filenames on the [CAD] share:/para + +programlisting +smbconfsection name=[CAD]/ + smbconfoption name=path/data/cad/smbconfoption + smbconfoption name=vfs objectscatia/smbconfoption + smbconfoption name=catia:mappings0x22:0xa8/smbconfoption +/programlisting + +paraTo get the full formerly fixed mappings:/para +programlisting +smbconfsection name=[CAD]/ + smbconfoption name=path/data/cad/smbconfoption + smbconfoption name=vfs objectscatia/smbconfoption + smbconfoption name=catia:mappings0x22:0xa8,0x2a:0xa4,0x2f:0xf8,0x3a:0xf7,0x3c:0xab,0x3e:0xbb,0x3f:0xbf,0x5c:0xff,0x7c:0xa6,0x20:0xb1/smbconfoption +/programlisting + +paraUnix filename to be translated (Note that the path delimiter / is not used here): + /para + paraa\a:a*a?aalt;agt;a|a a/para + + paraResulting windows filename:/para + + paraa#x00ff;a#x00f7;a#x00a4;a#x00bf;a#x00a8;a#x00ab;a#x00bb;a#x00a6;a#x00b1;a + /para + +paraNote that the character mapping must work in BOTH directions + (unix -gt; windows and windows -gt; unix) to get unique and existing file names! + /para + + paraA NOT
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via e4cd11d vfs_catia: add my copyright via 048434c vfs_catia: add a sample for filename mapping to the manual page via 2ebd2ca vfs_catia: fix the completely outdated manual page via 0a719b7 vfs_catia: fix the translation to vfs_translate_to_windows via d90d99d vfs_catia: add debug class for that module from 9899861 tsocket_bsd: Attempt to increase the SO_SNDBUF if we get EMSGSIZE in sendto() http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit e4cd11dccb9db1932ba19134c3e422294d66d647 Author: Guenter Kukkukk ku...@samba.org Date: Fri Mar 1 00:58:05 2013 +0100 vfs_catia: add my copyright Signed-off-by: Guenter Kukkukk ku...@samba.org Reviewed-by: Jeremy Allison j...@samba.org The last 5 patches address bug #9701 - vfs_catia is not working anymore (due to a former regression). Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org Autobuild-Date(v4-0-test): Mon Mar 11 10:55:48 CET 2013 on sn-devel-104 commit 048434c02fcf30d85d1a91128f7a26f10964bc6c Author: Guenter Kukkukk ku...@samba.org Date: Fri Mar 1 00:36:08 2013 +0100 vfs_catia: add a sample for filename mapping to the manual page Signed-off-by: Guenter Kukkukk ku...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit 2ebd2cafe4817a9d98f0d0cbdd2e70d31a444bae Author: Guenter Kukkukk ku...@samba.org Date: Thu Feb 28 06:12:36 2013 +0100 vfs_catia: fix the completely outdated manual page The complete rework around 3.5.0 was not even mentioned somewhere. (i was not able to find any info about that major change) Signed-off-by: Guenter Kukkukk ku...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit 0a719b7deab7a74630225dd4e654fff0a9f4ece2 Author: Guenter Kukkukk ku...@samba.org Date: Wed Feb 27 05:50:52 2013 +0100 vfs_catia: fix the translation to vfs_translate_to_windows THANKS to an IRC user (Raimund ?) who asked for a char mapping possibility. I suggested vfs_catia - but it did not work! Hopefully now it will. :-) Signed-off-by: Guenter Kukkukk ku...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit d90d99d00e3d10960ad1858c729378cb23a9dcf6 Author: Guenter Kukkukk ku...@samba.org Date: Wed Feb 27 05:34:05 2013 +0100 vfs_catia: add debug class for that module Signed-off-by: Guenter Kukkukk ku...@samba.org Reviewed-by: Jeremy Allison j...@samba.org --- Summary of changes: docs-xml/manpages/vfs_catia.8.xml | 66 +++- source3/modules/vfs_catia.c | 35 +--- 2 files changed, 94 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages/vfs_catia.8.xml b/docs-xml/manpages/vfs_catia.8.xml index a5f6233..b18dc48 100644 --- a/docs-xml/manpages/vfs_catia.8.xml +++ b/docs-xml/manpages/vfs_catia.8.xml @@ -31,18 +31,31 @@ paraThe Catia CAD package commonly creates filenames that use characters that are illegal in CIFS filenames. The - commandvfs_catia/command VFS module implements a fixed character + commandvfs_catia/command VFS module implements a character mapping so that these files can be shared with CIFS clients. /para paraThis module is stackable./para + paraUp to samba version 3.4.x a fixed character mapping was used. + The invalid windows characters \ / : * ? lt; gt; | and the blank + character were mapped in a hardcoded way. + /para + + paraStarting with samba-3.5.0 a more flexible mapping was introduced. + The new parameter catia:mappings now specifies the mapping on a char by char + basis using the notation: unix hex char 0x.. : windows hex char 0x.. + Multiple character mappings are separated by a comma. + /para + + /refsect1 refsect1 titleEXAMPLES/title + paraSamba versions up to 3.4.x:/para paraMap Catia filenames on the [CAD] share:/para programlisting @@ -51,12 +64,60 @@ smbconfoption name=vfs objectscatia/smbconfoption /programlisting + paraSamba versions 3.5.0 and later:/para + paraMap Catia filenames on the [CAD] share:/para + +programlisting +smbconfsection name=[CAD]/ + smbconfoption name=path/data/cad/smbconfoption + smbconfoption name=vfs objectscatia/smbconfoption + smbconfoption name=catia:mappings0x22:0xa8/smbconfoption +/programlisting + +paraTo get the full formerly fixed mappings:/para +programlisting +smbconfsection name=[CAD]/ + smbconfoption name=path/data/cad/smbconfoption + smbconfoption name=vfs objectscatia/smbconfoption + smbconfoption
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 58e385a Revert Ensure the masks don't conflict with the ACL
checks.
via fc496ef smbd:posix_acls Remove incorrectly added lp_create_mask()
and lp_dir_mask() calls
from 287b5f6 param: Remove incorrectly added defaults in AD DC allowing
WORLD WRITABLE files
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 58e385a5ac37c072a4eef3baa7926b799a732e94
Author: Andrew Bartlett abart...@samba.org
Date: Sun Mar 10 20:25:53 2013 +1100
Revert Ensure the masks don't conflict with the ACL checks.
This reverts commit 78594909b8b22bd07978922b1c85dfd6f6456963 which was
needed by 7622aa16adeb00bf161a6dd07664c37125391272.
This change masked bug #9462 which was fixed by
2013bb9b4dbed747921df2591068e2765428f57d. The issue was that the
defaults for the substituted parameters did not match the old
parameter. Changing the values in our test suite hid the issue, but
did not fix the issue.
(Additional change in the revert is to correct the expected ACL value
in posixacl.py due to changed implied inherited permissions).
Andrew Bartlett
Reviewed-by: Michael Adam ob...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
Autobuild-User(master): Michael Adam ob...@samba.org
Autobuild-Date(master): Mon Mar 11 19:46:24 CET 2013 on sn-devel-104
commit fc496ef323c908a6b621198d9dc8076f6857385e
Author: Andrew Bartlett abart...@samba.org
Date: Fri Mar 8 16:15:37 2013 +1100
smbd:posix_acls Remove incorrectly added lp_create_mask() and lp_dir_mask()
calls
When 6adc7dad96b8c7366da042f0d93b28c1ecb092eb removed the calls to
lp_security_mask/lp_force_security_mode/lp_dir_security_mask/lp_force_dir_security_mode
these calls were replaced with lp_create_mask() and lp_dir_mask()
The issue is that while lp_security_mask() and lp_dir_security_mask
defaulted to
0777, the replacement calls did not. This changes behaviour, and
incorrectly
prevents a posix mode being specified by the client from being applied to
the disk in the non-ACL enabled case.
Andrew Bartlett
Reviewed-by: Jeremy Allison j...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
---
Summary of changes:
python/samba/tests/posixacl.py |2 +-
selftest/target/Samba3.pm |3 +--
selftest/target/Samba4.pm |3 +--
source3/smbd/posix_acls.c | 17 -
4 files changed, 3 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/tests/posixacl.py b/python/samba/tests/posixacl.py
index 7cd22eb..f3a4772 100644
--- a/python/samba/tests/posixacl.py
+++ b/python/samba/tests/posixacl.py
@@ -227,7 +227,7 @@ class PosixAclMappingTests(TestCaseInTempDir):
smbd.chown(self.tempdir, BA_id, SO_id)
smbd.set_simple_acl(self.tempdir, 0750)
facl = getntacl(self.lp, self.tempdir, direct_db_access=False)
-acl =
O:BAG:SOD:(A;;0x001f01ff;;;BA)(A;;0x001200a9;;;SO)(A;WD)(A;OICIIO;0x001f01ff;;;CO)(A;OICIIO;0x001f01ff;;;CG)(A;OICIIO;0x001f01ff;;;WD)
+acl =
O:BAG:SOD:(A;;0x001f01ff;;;BA)(A;;0x001200a9;;;SO)(A;WD)(A;OICIIO;0x001f01ff;;;CO)(A;OICIIO;0x001200a9;;;CG)(A;OICIIO;0x001200a9;;;WD)
anysid = security.dom_sid(security.SID_NT_SELF)
self.assertEquals(acl, facl.as_sddl(anysid))
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 8d9c4b9..72c1116 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -986,8 +986,7 @@ sub provision($$)
map system = no
map readonly = no
store dos attributes = yes
- create mask = 0777
- directory mask = 0777
+ create mask = 755
dos filemode = yes
vfs objects = $vfs_modulesdir_abs/acl_xattr.so
$vfs_modulesdir_abs/fake_acls.so $vfs_modulesdir_abs/xattr_tdb.so
$vfs_modulesdir_abs/streams_depot.so
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 6f69414..495cc23 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1399,8 +1399,7 @@ sub provision_plugin_s4_dc($$)
smbd:sharedelay = 10
smbd:writetimeupdatedelay = 50
- create mask = 0777
- directory mask = 0777
+ create mask = 755
dos filemode = yes
dcerpc endpoint servers = -winreg -srvsvc
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index fbeb662..ee8b4d3 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3084,14 +3084,11 @@ SMB_ACL_T free_empty_sys_acl(connection_struct *conn,
SMB_ACL_T the_acl)
static bool convert_canon_ace_to_posix_perms( files_struct *fsp, canon_ace
*file_ace_list, mode_t *posix_perms)
{
- int snum = SNUM(fsp-conn);
size_t
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via fb924d0 s3: remove some dead code (for setdir command)
from 58e385a Revert Ensure the masks don't conflict with the ACL
checks.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit fb924d02ec05f7106beeeb409becbc39e00ddac9
Author: Christian Ambach a...@samba.org
Date: Mon Mar 11 22:23:27 2013 +0100
s3: remove some dead code (for setdir command)
set dir seems to have been a special SMB command used by Pathworks clients
the supporting code for it was already removed in 2007, so just remove all
remnants related to it (smb.conf parameter, documentation, ...)
Reviewed-by: Jeremy Allison j...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Tue Mar 12 01:03:37 CET 2013 on sn-devel-104
---
Summary of changes:
docs-xml/smbdotconf/misc/setdirectory.xml | 19 --
docs-xml/using_samba/ch08.xml | 30
examples/scripts/shares/python/smbparm.py |1 -
lib/param/param_functions.c |1 -
lib/param/param_table.c |9
source3/include/proto.h |1 -
source3/include/smb_macros.h |1 -
source3/include/smbprofile.h |5
source3/param/loadparm.c |1 -
source3/profile/profile.c |1 -
source3/utils/status_profile.c|4 ---
11 files changed, 5 insertions(+), 68 deletions(-)
delete mode 100644 docs-xml/smbdotconf/misc/setdirectory.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/misc/setdirectory.xml
b/docs-xml/smbdotconf/misc/setdirectory.xml
deleted file mode 100644
index 5e7b379..000
--- a/docs-xml/smbdotconf/misc/setdirectory.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-samba:parameter name=set directory
-context=S
-type=boolean
-xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
-description
- para
- If command moreinfo=noneset directory = no/command, then users
of the
- service may not use the setdir command to change directory.
- /para
-
- para
- The command moreinfo=nonesetdir/command command is only
implemented
- in the Digital Pathworks client. See the Pathworks documentation
- for details.
- /para
-/description
-
-value type=defaultno/value
-/samba:parameter
diff --git a/docs-xml/using_samba/ch08.xml b/docs-xml/using_samba/ch08.xml
index 91e216a..7465b8a 100644
--- a/docs-xml/using_samba/ch08.xml
+++ b/docs-xml/using_samba/ch08.xml
@@ -1795,27 +1795,7 @@ panic action/title
/sect2
-
-
-
-sect2 role= label=8.6.13 id=ch08-SECT-6.0.13
-indexterm id=ch08-idx-965993-0primaryset directory
option/primary/indexterm
-title
-set directory/title
-
-
-paraThis boolean share-level option allows indexterm
id=ch08-idx-965497-0primaryDigital Pathworks clients, option
for/primary/indextermDigital Pathworks clients to use the
literalsetdir/literal command to change directories on the server. If you
are not using the Digital Pathworks client, you should not need to alter this
option. The default value for this option is literalno/literal. You can
override it per share as follows:/para
-
-
-programlisting[data]
- set directory = yes/programlisting
-/sect2
-
-
-
-
-
-sect2 role= label=8.6.14 id=ch08-SECT-6.0.14
+sect2 role= label=8.6.13 id=ch08-SECT-6.0.14
indexterm id=ch08-idx-965994-0primarysmbrun option/primary/indexterm
title
smbrun/title
@@ -1832,7 +1812,7 @@ smbrun/title
-sect2 role= label=8.6.15 id=ch08-SECT-6.0.15
+sect2 role= label=8.6.14 id=ch08-SECT-6.0.15
indexterm id=ch08-idx-965995-0primarystatus option/primary/indexterm
title
status/title
@@ -1850,7 +1830,7 @@ status/title
-sect2 role= label=8.6.16 id=ch08-SECT-6.0.16
+sect2 role= label=8.6.15 id=ch08-SECT-6.0.16
indexterm id=ch08-idx-965996-0primarystrict sync
option/primary/indexterm
title
strict sync/title
@@ -1867,7 +1847,7 @@ strict sync/title
-sect2 role= label=8.6.17 id=ch08-SECT-6.0.17
+sect2 role= label=8.6.16 id=ch08-SECT-6.0.17
indexterm id=ch08-idx-965997-0primarysync always
option/primary/indexterm
title
sync always/title
@@ -1884,7 +1864,7 @@ sync always/title
-sect2 role= label=8.6.18 id=ch08-SECT-6.0.18
+sect2 role= label=8.6.17 id=ch08-SECT-6.0.18
indexterm id=ch08-idx-965998-0primarystrip dot
option/primary/indexterm
title
strip dot/title
diff --git a/examples/scripts/shares/python/smbparm.py
b/examples/scripts/shares/python/smbparm.py
index f0bc1ec..287b357 100644
--- a/examples/scripts/shares/python/smbparm.py
+++ b/examples/scripts/shares/python/smbparm.py
@@ -68,7 +68,6 @@ parm_table = {
USESPNEGO : (use spnego, SambaParmBool,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 389197e scripting: No longer install samba_upgradeprovision
from fb924d0 s3: remove some dead code (for setdir command)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 389197e7c31e8d6616e6503181c088940ddb5986
Author: Andrew Bartlett abart...@samba.org
Date: Thu Feb 28 00:03:19 2013 +1100
scripting: No longer install samba_upgradeprovision
This tool is an important part of the toolkit a Samba Team member can
use to assist a user with the upgrade of a very old Samba 4.0 AD DC
installation.
However, like all powerful tools, it has sharp edges, and these need
to have more protection added before we recommend the tool be used.
The WHATSNEW already indicated that this tool should not be used but a
large number of users have run it, and due to lack of testing in the
past, some have run into bugs.
While this tool can be run in debug modes, by default it simply fixes
the database following a series of internal rule. This does a good
job much of the time, but does not request permission in the way that
dbcheck does, and will create extra objects for things like the DNS
partitions.
By removing this from the installed binaries, we provide another
signal that it should not be used right now, until these matters are
fixed and some clear documentation on how to safely use the tool can
be written.
Andrew Bartlett
Reviewed-by: Michael Adam ob...@samba.org
Autobuild-User(master): Michael Adam ob...@samba.org
Autobuild-Date(master): Tue Mar 12 02:51:23 CET 2013 on sn-devel-104
---
Summary of changes:
source4/scripting/wscript_build |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
index 9af23f6..39408ba 100644
--- a/source4/scripting/wscript_build
+++ b/source4/scripting/wscript_build
@@ -4,7 +4,7 @@ from samba_utils import MODE_755
sbin_files = None
if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
-sbin_files = 'bin/samba_upgradeprovision bin/samba_dnsupdate
bin/samba_spnupdate bin/samba_upgradedns bin/samba_kcc'
+sbin_files = 'bin/samba_dnsupdate bin/samba_spnupdate bin/samba_upgradedns
bin/samba_kcc'
if sbin_files:
bld.INSTALL_FILES('${SBINDIR}',
--
Samba Shared Repository
