[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 51ae17b docs: overhaul the description of smb encrypt to include SMB3 encryption. via 471744a Make sure we initialize conn to NULL, because a routine we call may give an error and not touch conn, and then we get an error when trying to TALLOC_FREE it. from 79dc084 torture: Add smb2.notify.rmdir https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 51ae17b0703eaa481d602ffc7d8231a629fcb5fd Author: Michael Adam ob...@samba.org Date: Thu Apr 23 10:38:15 2015 +0200 docs: overhaul the description of smb encrypt to include SMB3 encryption. Signed-off-by: Michael Adam ob...@samba.org Reviewed-by: Jeremy Allison j...@samba.org Autobuild-User(master): Jeremy Allison j...@samba.org Autobuild-Date(master): Fri Apr 24 00:53:20 CEST 2015 on sn-devel-104 commit 471744a32d37f187c87f9bfa6f860b69446b9afe Author: Richard Sharpe rsha...@nutanix.com Date: Thu Apr 23 12:36:28 2015 -0700 Make sure we initialize conn to NULL, because a routine we call may give an error and not touch conn, and then we get an error when trying to TALLOC_FREE it. Signed-off-by: Richard Sharpe rsha...@samba.org Reviewed-by: Jeremy Allison j...@samba.org --- Summary of changes: docs-xml/smbdotconf/security/smbencrypt.xml | 232 source3/utils/net_dns.c | 2 +- 2 files changed, 200 insertions(+), 34 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/security/smbencrypt.xml b/docs-xml/smbdotconf/security/smbencrypt.xml index b55af85..14b32c2 100644 --- a/docs-xml/smbdotconf/security/smbencrypt.xml +++ b/docs-xml/smbdotconf/security/smbencrypt.xml @@ -4,40 +4,206 @@ basic=1 xmlns:samba=http://www.samba.org/samba/DTD/samba-doc; description + para + This parameter controls whether a remote client is allowed or required + to use SMB encryption. It has different effects depending on whether + the connection uses SMB1 or SMB2 and newer: + /para -paraThis is a new feature introduced with Samba 3.2 and above. It is an -extension to the SMB/CIFS protocol negotiated as part of the UNIX extensions. -SMB encryption uses the GSSAPI (SSPI on Windows) ability to encrypt -and sign every request/response in a SMB protocol stream. When -enabled it provides a secure method of SMB/CIFS communication, -similar to an ssh protected session, but using SMB/CIFS authentication -to negotiate encryption and signing keys. Currently this is only -supported by Samba 3.2 smbclient, and hopefully soon Linux CIFSFS -and MacOS/X clients. Windows clients do not support this feature. -/para - -paraThis controls whether the remote client is allowed or required to use SMB encryption. Possible values -are emphasisauto/emphasis, emphasismandatory/emphasis -and emphasisdisabled/emphasis. This may be set on a per-share -basis, but clients may chose to encrypt the entire session, not -just traffic to a specific share. If this is set to mandatory -then all traffic to a share emphasismust/emphasis -be encrypted once the connection has been made to the share. -The server would return access denied to all non-encrypted -requests on such a share. Selecting encrypted traffic reduces -throughput as smaller packet sizes must be used (no huge UNIX -style read/writes allowed) as well as the overhead of encrypting -and signing all the data. -/para - -paraIf SMB encryption is selected, Windows style SMB signing (see -the smbconfoption name=server signing/ option) is no longer necessary, -as the GSSAPI flags use select both signing and sealing of the data. -/para - -paraWhen set to auto or default, SMB encryption is offered, but not enforced. -When set to mandatory, SMB encryption is required and if set -to disabled, SMB encryption can not be negotiated./para + itemizedlist + listitem + para + If the connection uses SMB1, then this option controls the use + of a Samba-specific extension to the SMB protocol introduced in + Samba 3.2 that makes use of the Unix extensions. + /para + /listitem + + listitem + para + If the connection uses SMB2 or newer, then this option controls + the use of the SMB-level encryption that is supported in SMB + version 3.0 and above and available in Windows 8 and newer. + /para + /listitem + /itemizedlist + + para + This parameter can be set globally and on a per-share bases. + Possible values are + emphasisoff/emphasis
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 78cdd5e buildtools: Use all of pyext_PATTERN in map_shlib_extension
via cc491fb buildtools: Honor LDVERSION when looking for Python library
via 8ac21ec pytalloc: Add tests
via 50311c7 wafsamba: Add install argument to SAMBA_PYTHON
via 8ac9c86 pytalloc: Fix comparison of disparate types
from 51ae17b docs: overhaul the description of smb encrypt to include
SMB3 encryption.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 78cdd5ea7ddf265d8143c8d9dc42934889618dd1
Author: Petr Viktorin pvikt...@redhat.com
Date: Wed Nov 12 19:49:45 2014 +0100
buildtools: Use all of pyext_PATTERN in map_shlib_extension
In Python 3, C extension module filenames have an ABI tag;
the pyext_PATTERN is e.g. %s.cpython-34m.so.
The build system was only using the last dot-separated element
of that extension (the .so).
Use the whole extension when constructing the final filename.
Signed-off-by: Petr Viktorin pvikt...@redhat.com
Reviewed-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andreas Schneider a...@samba.org
Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Fri Apr 24 04:26:45 CEST 2015 on sn-devel-104
commit cc491fb080882e36f549fd0a348800431ccb3074
Author: Petr Viktorin pvikt...@redhat.com
Date: Wed Nov 12 16:53:33 2014 +0100
buildtools: Honor LDVERSION when looking for Python library
Since Python 3.2, Python .so files are tagged for ABI compatibility,
so the library name is something like libpython3.4m.so (note the 'm').
This information is found in distutils.sysconfig.get_config_var('LDVERSION')
This fixes waf issue 1405
(https://code.google.com/p/waf/issues/detail?id=1405)
Signed-off-by: Petr Viktorin pvikt...@redhat.com
Reviewed-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andreas Schneider a...@samba.org
commit 8ac21ec4aa76beb48c9c26cf1fd45495324d74cc
Author: Petr Viktorin pvikt...@redhat.com
Date: Thu Mar 5 10:06:05 2015 +0100
pytalloc: Add tests
Add tests for pytalloc.
Since talloc objects can't be created from Python, a C extension
with helpers is added.
Signed-off-by: Petr Viktorin pvikt...@redhat.com
Reviewed-by: Andreas Schneider a...@samba.org
Reviewed-by: Jelmer Vernooij jel...@samba.org
commit 50311c760685335160742efa01bc64584265ffd5
Author: Petr Viktorin pvikt...@redhat.com
Date: Fri Mar 6 11:55:49 2015 +0100
wafsamba: Add install argument to SAMBA_PYTHON
This allows building Python modules that are only used for testing.
Signed-off-by: Petr Viktorin pvikt...@redhat.com
Reviewed-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andreas Schneider a...@samba.org
commit 8ac9c860de3b902855a00d7589b8a614eec3de45
Author: Petr Viktorin pvikt...@redhat.com
Date: Fri Mar 6 18:57:00 2015 +0100
pytalloc: Fix comparison of disparate types
When fed Python objects of different types, pytalloc_default_cmp
compared pointers to PyType objects that weren't part of an array,
resulting in undefined behavior.
This makes things a bit better (though it still casts ptrdiff_t to int).
Signed-off-by: Petr Viktorin pvikt...@redhat.com
Reviewed-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andreas Schneider a...@samba.org
---
Summary of changes:
buildtools/wafsamba/samba_python.py | 2 +
buildtools/wafsamba/samba_utils.py | 2 +-
lib/talloc/pytalloc.c| 2 +-
lib/talloc/test_pytalloc.c | 128 +++
lib/talloc/test_pytalloc.py | 114 +++
lib/talloc/wscript | 19 -
third_party/waf/wafadmin/Tools/python.py | 14 ++--
7 files changed, 273 insertions(+), 8 deletions(-)
create mode 100644 lib/talloc/test_pytalloc.c
create mode 100644 lib/talloc/test_pytalloc.py
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_python.py
b/buildtools/wafsamba/samba_python.py
index 1ec2f7b..a371b43 100644
--- a/buildtools/wafsamba/samba_python.py
+++ b/buildtools/wafsamba/samba_python.py
@@ -34,6 +34,7 @@ def SAMBA_PYTHON(bld, name,
init_function_sentinel=None,
local_include=True,
vars=None,
+ install=True,
enabled=True):
'''build a python extension for Samba'''
@@ -64,6 +65,7 @@ def SAMBA_PYTHON(bld, name,
install_path='${PYTHONARCHDIR}',
allow_undefined_symbols=True,
allow_warnings=True,
+ install=install,
enabled=enabled)
Build.BuildContext.SAMBA_PYTHON =
