[SCM] Samba Shared Repository - branch v4-1-test updated
The branch, v4-1-test has been updated via 7d791d5 VERSION: Bump version number up to 4.1.0... via dd444e6 VERSION: Disable git snapshots for the 4.1.0rc3 release. from 3beda4c WHATSNEW: Update changes since 4.1.0rc2. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-test - Log - commit 7d791d5821fc50a5dcaa42b3cc63e2fea41f541e Author: Karolin Seeger ksee...@samba.org Date: Fri Sep 6 11:54:23 2013 +0200 VERSION: Bump version number up to 4.1.0... and re-enable git snapshots. Signed-off-by: Karolin Seeger ksee...@samba.org commit dd444e6022f9924afc47bc355d5066882c7c71cb Author: Karolin Seeger ksee...@samba.org Date: Fri Sep 6 11:46:16 2013 +0200 VERSION: Disable git snapshots for the 4.1.0rc3 release. Signed-off-by: Karolin Seeger ksee...@samba.org --- Summary of changes: VERSION |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/VERSION b/VERSION index f6a29ee..64306e2 100644 --- a/VERSION +++ b/VERSION @@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE= # e.g. SAMBA_VERSION_RC_RELEASE=1 # # - 3.0.0rc1 # -SAMBA_VERSION_RC_RELEASE=3 +SAMBA_VERSION_RC_RELEASE= # To mark SVN snapshots this should be set to 'yes'# -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-1-stable updated
The branch, v4-1-stable has been updated via 6a03c81 VERSION: Disable git snapshots for the 4.1.0rc3 release. via d9517d5 WHATSNEW: Update changes since 4.1.0rc2. via cfa4e2a Optimization. Don't do the retry logic if sitename_fetch() returned NULL, we already did a NULL query. via 3912eeb9 Move the retry logic when site_name is passed in a NULL or to the wrapper function. via 2d7fe2b Move the manipulation of site_name into the caller function dsgetdcname(). via 0c046a4 Refactor dsgetdcname to be called via a wrapper function. via a616bbc dsgetdcname_cache_fetch() doesn't use the site_name parameter so don't pass it. via 317f960 smbd: Correctly return INFO_LENGTH_MISMATCH for smb1 via 26ac864 smbd: Fix error return for STREAM_INFO via db4e8a7 smbd: Revert a93f9c3 via 0e91fd6 smbd: Correctly return BUFFER_OVERFLOW in smb2_getinfo via 9444c6f smbd: Correctly return INFO_LENGTH_MISMATCH in smb2_getinfo via b4427b9 smbd: qfsinfo has fixed/variable buffers via 3691f46 smbd: qfilepathinfo has fixed/variable buffers via 6ee8231 smbd: Use #defines in smb2_getinfo_send via a9ef99c s3:smbd: allow info class SMB_QUERY_FS_ATTRIBUTE_INFO to return partial data via 25fbced s3:smbd: allow info class SMB_QUERY_FS_VOLUME_INFO to return partial data via 342afee s3:smbd: allow status code in smbd_do_qfsinfo() to be set by information class handler via 5e75d4b s3:smbd: allow GetInfo responses with STATUS_BUFFER_OVERFLOW to return partial, but valid data via 2b411e6 s3:smbd: return NT_STATUS_INFO_LENGTH_MISMATCH for GetInfo in case output_buffer_length is too small via a654601 torture: Ensure that GSSAPI and SPNEGO packets are accepted by dlz_bind9 via 1e653e4 selftest: Add a basic test of samba_upgradedns via 79b7888 selftest: Start internal DNS server on domain provisioned for BIND9_DLZ via 0d7c1f0 selftest: Test creation of the dns-SERVER account during selftest via e00be93 scripting/samba_upgradedns: Tighten up exception and attribute list handling via fee6fa5 scripting/join.py: Handle creating the dns-NAME account during a DC join via e6cbc39 WHATSNEW: Add paragraph about SMB2/3 support for client tools/library. via cf677c4 WHATSNEW: Add release notes for Samba 4.1.0rc3. via bfd3cc3 python/provision: remove unused linklocal=False argument from interface_ips_v6() via 21708c1 s4:samba_upgradedns: don't pass linklocal=False to interface_ips_v6() via 10c1784 python/pyglue: filter out loopback and linklocal addresses unless all_interfaces is given via ac1a309 client: add missing newlines to error messages for invalid iosize parameter. via 5ba00cf Add documentation for the new internal command timeout to smbclient. via b455784 Add documentation for the new -t timeout parameter in smbclient. via 742c5c6 Fix the documentation of --encrypt to explain SMB3 encryption for smbclient. via 4b3ce19 Fix the documentation of the iosize command to explain the new zero default for smbclient. via bd16454 Fix the documentation for --send-buffersize for the new default value of zero for smbclient. via 11890a5 Expand on the documentation of -m max-protocol for SMB2/3 for smbclient. via cda1b51 Add -e encrypt transport command line option documentation for smbcacls. via ff43be5 Add max protocol command line documentation for smbcacls. via 69058ee Add new timeout command and -t option to smbclient to set the per-operation timeout. via c0aed70 As SMB3 has transport level encryption, allow smbclient -e to force encryted SMB3 transport. via 449503d Remove restrictions on setting iosize inside smbclient for SMB2 connections. via 947cd1d libsmb: Fix a bunch of Coverity IDs via 2fb817c s3:libsmb: call smb2cli_logoff() from cli_ulogoff() via 159b051 s3:libsmb: make cli_ulogoff_send/recv static via 409ab74 s3:libsmb: call smb2cli_tdis() from cli_tdis() via 9d2ecfe s3:libsmb: only set tcon to invalid in smb2cli_tdis* via c935ba3 s3:libsmb: make cli_tdis_send/recv static via 26a1fd3 s3:libsmb: add support for SMB2 in cli_writeall() via 1d0a87e s3:libsmb: add SMB2 support to cli_pull* via e9d7054 s3:libsmb: add SMB2 support to cli_push* via bd104ef s3:libsmb: Plumb cli_smb2_set_security_descriptor() inside cli_set_security_descriptor(). via c774061 s3:libsmb: Plumb cli_smb2_query_security_descriptor() inside cli_query_security_descriptor(). via 5ef4556 s3:libsmb: Plumb cli_smb2_qpathinfo_alt_name() inside cli_qpathinfo_alt_name(). via 919cb48 s3:libsmb: Plumb cli_smb2_qpathinfo_basic() inside cli_qpathinfo_basic(). via e7ff8b9 s3:libsmb: Plumb cli_smb2_qfileinfo_basic() inside
[SCM] Samba Shared Repository - annotated tag samba-4.1.0rc3 created
The annotated tag, samba-4.1.0rc3 has been created at 757e9eab4f67a620d8a05fd226b60244643cc132 (tag) tagging 6a03c817b3a0ef278d10893eafd327ee20bdca58 (commit) replaces samba-4.1.0rc2 tagged by Karolin Seeger on Fri Sep 6 12:00:16 2013 +0200 - Log - samba: tag release samba-4.1.0rc3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iD8DBQBSKaewbzORW2Vot+oRAqD8AJ9hbYpihs73Aad8Fb6j3NvxroDBGACglB25 sS9CLQZbLKwnVImAb8jipk0= =MA3a -END PGP SIGNATURE- Andreas Schneider (3): s3-libads: Print a message if no realm has been specified. s3-winbind: Fix a segfault passing NULL to a fstring argument. Followup patch for BUG: https://bugzilla.samba.org/show_bug.cgi?id=10082 Andrew Bartlett (6): scripting/join.py: Handle creating the dns-NAME account during a DC join scripting/samba_upgradedns: Tighten up exception and attribute list handling selftest: Test creation of the dns-SERVER account during selftest selftest: Start internal DNS server on domain provisioned for BIND9_DLZ selftest: Add a basic test of samba_upgradedns torture: Ensure that GSSAPI and SPNEGO packets are accepted by dlz_bind9 Christian Ambach (5): s3:lib/system fix build on AIX 7 waf: fix build on AIX7 waf: add --without-gettext option waf: consolidate libintl related checks waf: replace dependency to libintl with samba_intl Günther Deschner (9): s3-libads: Fail create_local_private_krb5_conf_for_domain() if parameters missing. s3-winbindd: fix fallback to ncacn_np in cm_connect_lsat(). s3-winbindd: remove pointless variable assigment, see the strdup below. s3-winbindd: Fix memory leak in ads_cached_connection(). s3-winbindd: Fix winbind on DC crash with trusted AD domains. s3-winbindd: use find_domain_from_name() instead of find_domain_from_name_no_init(). s3-winbindd: make sure also the idmap code can deal with trusted domains. s3-winbindd: use get_trust_pw_clear() wrapper for AD connection code. s3-winbindd: remove unneded include of secrets.h from idmap_ad.c Jeremy Allison (52): Fix bug #10063 - source3/lib/util.c:1493 leaking memory w/ pam_winbind.so / winbind Fix the erroneous masking of chmod requests via the UNIX extensions. Allow UNIX extensions client to act on open fsp instead of pathname if available. Fix the UNIX extensions CHOWN calls to use FCHOWN if available, else LCHOWN. s3:param: Correctly set up cli_maxprotocol, cli_minprotocol in our parameter block. s3:libsmb: Modify cli_start_connection_connected() to use lp_cli_minprotocol()/lp_cli_maxprotocol() instead of hard coding PROTOCOL_CORE, PROTOCOL_NT1. s3:libsmb: Ensure we ask for DEFAULT_SMB2_MAX_CREDITS on successful negprot. s3:smbcacls: Add -mMAX PROTOCOL option to smbcacls. libcli/smb: Fix smb2cli_write_recv() and smb2cli_write() to return the bytes written. libcli/smb: Change smb2cli_create() and smb2cli_create_recv() to return a parameter blob of the newly opened/created file. s3:lib: Factor read_ea_list_entry() and read_nttrans_ea_list() out so they can be used by the SMB2 client code. s3:libsmb: Add in the core of the libsmb client SMB2 functions. s3:libsmb: Plumb cli_smb2_rename() inside cli_rename(). s3:libsmb: Plumb cli_smb2_unlink() inside cli_unlink(). s3:libsmb: Plumb cli_smb2_mkdir() inside cli_mkdir(). s3:libsmb: Plumb cli_smb2_rmdir() inside cli_rmdir(). s3:libsmb: Plumb cli_smb2_create_fnum() inside cli_ntcreate(). s3:libsmb: Plumb cli_smb2_close_fnum() inside cli_close(). s3:libsmb: Plumb cli_smb2_getattrE() inside cli_getattrE(). s3:libsmb: Plumb cli_smb2_setattrE() inside cli_setattrE(). s3:libsmb: Plumb cli_smb2_setatr() inside cli_setatr(). s3:libsmb: Plumb cli_smb2_getatr() inside cli_getatr(). s3:libsmb: Plumb cli_smb2_dskattr() inside cli_dskattr(). s3:libsmb: Fix cli_set_ea_path() to use frame instead of talloc_tos(). s3:libsmb: Plumb cli_smb2_set_ea_path() inside cli_set_ea_path(). s3:libsmb: Plumb cli_smb2_set_ea_fnum() inside cli_set_ea_fnum(). s3:libsmb: Plumb cli_smb2_get_ea_list_path() inside cli_get_ea_list_path(). s3:libsmb: Plumb cli_smb2_list() inside cli_list(). s3:libsmb: Plumb cli_smb2_qpathinfo2() inside cli_qpathinfo2(). s3:libsmb: Plumb cli_smb2_qpathinfo_streams() inside cli_qpathinfo_streams(). s3:libsmb: Plumb cli_smb2_qfileinfo_basic() inside cli_qfileinfo_basic(). s3:libsmb: Plumb cli_smb2_qpathinfo_basic() inside cli_qpathinfo_basic(). s3:libsmb: Plumb cli_smb2_qpathinfo_alt_name() inside cli_qpathinfo_alt_name(). s3:libsmb: Plumb cli_smb2_query_security_descriptor() inside cli_query_security_descriptor(). s3:libsmb: Plumb cli_smb2_set_security_descriptor()
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 6cab7c8 Announce Samba 4.1.0rc3. from f1efa59 Add Catalyst IT as global supporting company too http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 6cab7c85416385daae4e19a55aad371d24ad233b Author: Karolin Seeger ksee...@samba.org Date: Wed Sep 11 09:51:29 2013 +0200 Announce Samba 4.1.0rc3. Signed-off-by: Karolin Seeger ksee...@samba.org --- Summary of changes: generated_news/latest_10_bodies.html| 24 +++- generated_news/latest_10_headlines.html |7 --- generated_news/latest_2_bodies.html | 24 +++- 3 files changed, 26 insertions(+), 29 deletions(-) Changeset truncated at 500 lines: diff --git a/generated_news/latest_10_bodies.html b/generated_news/latest_10_bodies.html index 0b33808..6e5670f 100644 --- a/generated_news/latest_10_bodies.html +++ b/generated_news/latest_10_bodies.html @@ -1,3 +1,14 @@ + h5a name=4.1.0rc311 September 2013/a/h5 + p class=headlineSamba 4.1.0rc3 Available for Download/p + pThis is the third release candidate of the upcoming Samba 4.1 release series./p + +pThe uncompressed tarballs and patch files have been signed +using GnuPG (ID 6568B7EA). The source code can be +a href=https://download.samba.org/pub/samba/rc/samba-4.1.0rc3.tar.gz;downloaded +now/a. See a href=https://download.samba.org/pub/samba/rc/WHATSNEW-4.1.0rc3.txt;the +release notes for more info/a./p + + h5a name=4.0.920 August 2013/a/h5 p class=headlineSamba 4.0.9 Available for Download/p pThis is the latest stable release of the Samba 4.0 series./p @@ -140,16 +151,3 @@ now/a. A a href=http://samba.org/samba/ftp/patches/patch-3.6.14-3.6.15.diffs patch against Samba 3.6.14/a is also available. See a href=http://samba.org/samba/history/samba-3.6.15.html; the release notes for more info/a./p - - - h5a name=3.6.1429 April 2013/a/h5 - p class=headlineSamba 3.6.14 Available for Download/p - pThis is the latest stable release of the Samba 3.6 series./p - -pThe uncompressed tarballs and patch files have been signed -using GnuPG (ID 6568B7EA). The source code can be -a href=http://samba.org/samba/ftp/stable/samba-3.6.14.tar.gz;downloaded -now/a. A a href=http://samba.org/samba/ftp/patches/patch-3.6.13-3.6.14.diffs.gz; -patch against Samba 3.6.13/a is also available. -See a href=http://samba.org/samba/history/samba-3.6.14.html; -the release notes for more info/a./p diff --git a/generated_news/latest_10_headlines.html b/generated_news/latest_10_headlines.html index 28a37d2..ced8997 100644 --- a/generated_news/latest_10_headlines.html +++ b/generated_news/latest_10_headlines.html @@ -1,9 +1,12 @@ ul + li 11 September 2013 a href=#4.1.0rc3Samba 4.1.0rc3 Available for + Download/a/li + li 20 August 2013 a href=#4.0.9Samba 4.0.9 Available for Download/a/li li 14 August 2013 a href=#3.6.18Samba 3.6.18 Available for Download/a/li - li 09 August 2013 a href=4.1.0rc2Samba 4.1.0rc2 Available for + li 09 August 2013 a href=#4.1.0rc2Samba 4.1.0rc2 Available for Download/a/li li 05 August 2013 a href=#4.0.8Samba 4.0.8, 3.6.17 and 3.5.22 @@ -19,6 +22,4 @@ li 21 May 2013 a href=#4.0.6Samba 4.0.6 Available for Download/a/li li 08 April 2013 a href=#3.6.15Samba 3.6.15 Available for Download/a/li - - li 29 April 2013 a href=#3.6.14Samba 3.6.14 Available for Download/a/li /ul diff --git a/generated_news/latest_2_bodies.html b/generated_news/latest_2_bodies.html index b216105..724f501 100644 --- a/generated_news/latest_2_bodies.html +++ b/generated_news/latest_2_bodies.html @@ -1,3 +1,14 @@ + h5a name=4.1.0rc311 September 2013/a/h5 + p class=headlineSamba 4.1.0rc3 Available for Download/p + pThis is the third release candidate of the upcoming Samba 4.1 release series./p + +pThe uncompressed tarballs and patch files have been signed +using GnuPG (ID 6568B7EA). The source code can be +a href=https://download.samba.org/pub/samba/rc/samba-4.1.0rc3.tar.gz;downloaded +now/a. See a href=https://download.samba.org/pub/samba/rc/WHATSNEW-4.1.0rc3.txt;the +release notes for more info/a./p + + h5a name=4.0.920 August 2013/a/h5 p class=headlineSamba 4.0.9 Available for Download/p pThis is the latest stable release of the Samba 4.0 series./p @@ -9,16 +20,3 @@ now/a. A a href=http://samba.org/samba/ftp/patches/patch-4.0.8-4.0.9.diffs.g patch against Samba 4.0.8/a is also available. See a href=http://samba.org/samba/history/samba-4.0.9.html; the release notes for more info/a./p - - - h5a name=3.6.1814 August 2013/a/h5 - p class=headlineSamba 3.6.18 Available for Download/p - pThis is the latest stable release of the Samba 3.6 series./p -
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 73278cd smbd: Convert br_lck-lock_data to talloc
via 20cc710 smbd: Move struct byte_range_lock definition to brlock.c
via 07948ef smbd: Add brl_fsp access function
via 6bcfc1a smbd: Add brl_num_locks access function
via 635c35d smbd: Use ZERO_STRUCT instead of memset
via e2bb3b0 smbd: Fix a typo
via 2aa6844 smbd: Make brl_lock_failed static
via cca8faa smbd: Make brl_same_context static
via e533bf3 smbd: Fix blank line endings
from d809cf6 Raise the level of a debug.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 73278cd19bc80854a2b23ef787c3ebdc3fa56bfd
Author: Volker Lendecke v...@samba.org
Date: Tue Sep 10 21:04:47 2013 +0200
smbd: Convert br_lck-lock_data to talloc
Autobuild-User(master): Volker Lendecke v...@samba.org
Autobuild-Date(master): Wed Sep 11 10:15:38 CEST 2013 on sn-devel-104
commit 20cc710920d286f99f71bf0cf4ca95a7d17935dc
Author: Volker Lendecke v...@samba.org
Date: Tue Sep 10 19:42:06 2013 +0200
smbd: Move struct byte_range_lock definition to brlock.c
commit 07948ef6e12ac52ecbb23089495d3760028f019e
Author: Volker Lendecke v...@samba.org
Date: Tue Sep 10 19:41:32 2013 +0200
smbd: Add brl_fsp access function
commit 6bcfc1a9daad1432c45db816d32ac5076f748e81
Author: Volker Lendecke v...@samba.org
Date: Tue Sep 10 19:40:43 2013 +0200
smbd: Add brl_num_locks access function
commit 635c35dc8d0d7e9ee7f0a850552564896b7342d9
Author: Volker Lendecke v...@samba.org
Date: Tue Sep 10 12:04:42 2013 +
smbd: Use ZERO_STRUCT instead of memset
commit e2bb3b0c4a64ebfd7cd5143f50518fc534d020a2
Author: Volker Lendecke v...@samba.org
Date: Tue Sep 10 12:01:58 2013 +
smbd: Fix a typo
commit 2aa684453aea4739383257f53a0f13ea27759df2
Author: Volker Lendecke v...@samba.org
Date: Tue Sep 10 11:41:39 2013 +
smbd: Make brl_lock_failed static
commit cca8faa62194308001c029054578604d0a759967
Author: Volker Lendecke v...@samba.org
Date: Tue Sep 10 11:39:52 2013 +
smbd: Make brl_same_context static
commit e533bf3ef168424234a10331fa4edf98dacb3a4b
Author: Volker Lendecke v...@samba.org
Date: Tue Sep 10 11:35:01 2013 +
smbd: Fix blank line endings
---
Summary of changes:
source3/include/locking.h | 22 ++
source3/locking/brlock.c | 119 +---
source3/locking/locking.c |2 +-
source3/locking/proto.h |6 +-
source3/modules/vfs_full_audit.c |9 ++-
source3/modules/vfs_time_audit.c |6 +-
source3/rpc_server/srvsvc/srv_srvsvc_nt.c |2 +-
source3/smbd/blocking.c | 12 ++--
source3/smbd/open.c |2 +-
9 files changed, 100 insertions(+), 80 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/locking.h b/source3/include/locking.h
index 32593af..97c138a 100644
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -1,19 +1,19 @@
-/*
+/*
Unix SMB/CIFS implementation.
SMB parameters and setup, plus a whole lot more.
-
+
Copyright (C) Jeremy Allison 2006
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses/.
*/
@@ -47,17 +47,9 @@ struct files_struct;
#include lib/file_id.h
-struct byte_range_lock {
- struct files_struct *fsp;
- unsigned int num_locks;
- bool modified;
- bool read_only;
- struct file_id key;
- struct lock_struct *lock_data;
- struct db_record *record;
-};
+struct byte_range_lock;
-/* Internal structure in brlock.tdb.
+/* Internal structure in brlock.tdb.
The data in brlock records is an unsorted linear array of these
records. It is unnecessary to store the count as tdb provides the
size of the record */
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 865aaca..ac54767 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -1,4 +1,4 @@
-/*
+/*
Unix SMB/CIFS implementation.
byte range locking code
Updated to handle range splits/merges.
@@ -43,6 +43,16 @@
static struct db_context *brlock_db;
Re: [SCM] Samba Shared Repository - branch master updated
On Wed, Sep 11, 2013 at 10:16:02AM +0200, Volker Lendecke wrote: The branch, master has been updated via 73278cd smbd: Convert br_lck-lock_data to talloc via 20cc710 smbd: Move struct byte_range_lock definition to brlock.c via 07948ef smbd: Add brl_fsp access function via 6bcfc1a smbd: Add brl_num_locks access function via 635c35d smbd: Use ZERO_STRUCT instead of memset via e2bb3b0 smbd: Fix a typo via 2aa6844 smbd: Make brl_lock_failed static via cca8faa smbd: Make brl_same_context static via e533bf3 smbd: Fix blank line endings from d809cf6 Raise the level of a debug. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 73278cd19bc80854a2b23ef787c3ebdc3fa56bfd Author: Volker Lendecke v...@samba.org Date: Tue Sep 10 21:04:47 2013 +0200 smbd: Convert br_lck-lock_data to talloc Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Wed Sep 11 10:15:38 CEST 2013 on sn-devel-104 Gna. Pushed from the wrong tree. This was meant to carry Reviewed-by: Jeremy Allison j...@samba.org tags. Push a revert? Sorry! Volker -- SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen http://www.sernet.de, mailto:kont...@sernet.de * visit us on it-sa:IT security exhibitions in Nürnberg, Germany October 8th - 10th 2013, hall 12, booth 333 free tickets available via code 270691 on: www.it-sa.de/gutschein **
Re: [SCM] Samba Shared Repository - branch master updated
On Wed, Sep 11, 2013 at 10:18:50AM +0200, Volker Lendecke wrote: On Wed, Sep 11, 2013 at 10:16:02AM +0200, Volker Lendecke wrote: The branch, master has been updated via 73278cd smbd: Convert br_lck-lock_data to talloc via 20cc710 smbd: Move struct byte_range_lock definition to brlock.c via 07948ef smbd: Add brl_fsp access function via 6bcfc1a smbd: Add brl_num_locks access function via 635c35d smbd: Use ZERO_STRUCT instead of memset via e2bb3b0 smbd: Fix a typo via 2aa6844 smbd: Make brl_lock_failed static via cca8faa smbd: Make brl_same_context static via e533bf3 smbd: Fix blank line endings from d809cf6 Raise the level of a debug. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 73278cd19bc80854a2b23ef787c3ebdc3fa56bfd Author: Volker Lendecke v...@samba.org Date: Tue Sep 10 21:04:47 2013 +0200 smbd: Convert br_lck-lock_data to talloc Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Wed Sep 11 10:15:38 CEST 2013 on sn-devel-104 Gna. Pushed from the wrong tree. This was meant to carry Reviewed-by: Jeremy Allison j...@samba.org tags. Push a revert? No, not worth it IMHO. These messages are archived so anyone can check this was correctly reviewed. Jeremy.
Re: [SCM] Samba Shared Repository - branch master updated
On 2013-09-11 at 10:18 +0200, Volker Lendecke wrote: On Wed, Sep 11, 2013 at 10:16:02AM +0200, Volker Lendecke wrote: Gna. Pushed from the wrong tree. This was meant to carry Reviewed-by: Jeremy Allison j...@samba.org tags. Push a revert? I'd say there is no point. It is in the tree and you would have to get review for the revert first... ;) The important point is that review has in fact happened. This would not have happened, if we had installed a mechanism that would reject a push if one at least of the commits does not contain at least two signoff/review tags by team members... (Hint, hint... ;-) Cheers - Michael signature.asc Description: Digital signature
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 403ddac dsdb: When using an LDAP backend, force use of the password
from secrets.ldb
from 73278cd smbd: Convert br_lck-lock_data to talloc
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 403ddac6c899deeb452b32266e1b2169b1a09abe
Author: Andrew Bartlett abart...@samba.org
Date: Tue Sep 10 11:38:10 2013 +1200
dsdb: When using an LDAP backend, force use of the password from secrets.ldb
This makes testing from the command line much easier, as ldbsearch -H
sam.ldb will now just work as well as it did with a tdb-based
provision.
This code was removed from it's previous location outside the ldb
module stack in aabda85a2fc9f6763abd56d61ff819012f2225ad.
Andrew Bartlett
Signed-off-by: Andrew Bartlett abart...@samba.org
Signed-off-by: Nadezhda Ivanova nivan...@symas.com
Autobuild-User(master): Nadezhda Ivanova nivan...@samba.org
Autobuild-Date(master): Wed Sep 11 21:15:50 CEST 2013 on sn-devel-104
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/samba_dsdb.c | 99 +++
1 files changed, 99 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
index ee7f694..ac993db 100644
--- a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
+++ b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
@@ -37,6 +37,9 @@
#include dsdb/samdb/ldb_modules/util.h
#include dsdb/samdb/samdb.h
#include librpc/ndr/libndr.h
+#include auth/credentials/credentials.h
+#include param/secrets.h
+#include lib/ldb-samba/ldb_wrap.h
static int read_at_rootdse_record(struct ldb_context *ldb, struct ldb_module
*module, TALLOC_CTX *mem_ctx,
struct ldb_message **msg, struct ldb_request
*parent)
@@ -129,7 +132,94 @@ static int prepare_modules_line(struct ldb_context *ldb,
return ret;
}
+/*
+ * Force overwrite of the credentials with those
+ * specified in secrets.ldb, to connect across the
+ * ldapi socket to an LDAP backend
+ */
+static int set_ldap_credentials(struct ldb_context *ldb)
+{
+ const char *secrets_ldb_path, *sam_ldb_path;
+ char *private_dir, *p, *error_string;
+ struct ldb_context *secrets_ldb;
+ struct cli_credentials *cred;
+ struct loadparm_context *lp_ctx = ldb_get_opaque(ldb, loadparm);
+ TALLOC_CTX *tmp_ctx = talloc_new(ldb);
+
+ if (!tmp_ctx) {
+ return ldb_oom(ldb);
+ }
+
+ cred = cli_credentials_init(ldb);
+ if (!cred) {
+ talloc_free(tmp_ctx);
+ return ldb_oom(ldb);
+ }
+ cli_credentials_set_anonymous(cred);
+
+ /*
+* We don't want to use krb5 to talk to our samdb - recursion
+* here would be bad, and this account isn't in the KDC
+* anyway
+*/
+ cli_credentials_set_kerberos_state(cred, CRED_DONT_USE_KERBEROS);
+
+ /*
+* Work out where *our* secrets.ldb is. It must be in
+* the same directory as sam.ldb
+*/
+ sam_ldb_path = (const char *)ldb_get_opaque(ldb, ldb_url);
+ if (!sam_ldb_path) {
+ talloc_free(tmp_ctx);
+ return ldb_operr(ldb);
+ }
+ if (strncmp(tdb://, sam_ldb_path, 6) == 0) {
+ sam_ldb_path += 6;
+ }
+ private_dir = talloc_strdup(tmp_ctx, sam_ldb_path);
+ p = strrchr(private_dir, '/');
+ if (p) {
+ *p = '\0';
+ } else {
+ private_dir = talloc_strdup(tmp_ctx, .);
+ }
+
+ secrets_ldb_path = talloc_asprintf(private_dir, tdb://%s/secrets.ldb,
+ private_dir);
+
+ if (!secrets_ldb_path) {
+ talloc_free(tmp_ctx);
+ return ldb_oom(ldb);
+ }
+
+ /*
+* Now that we have found the location, connect to
+* secrets.ldb so we can read the SamDB Credentials
+* record
+*/
+ secrets_ldb = ldb_wrap_connect(tmp_ctx, NULL, lp_ctx, secrets_ldb_path,
+ NULL, NULL, 0);
+
+ if (!NT_STATUS_IS_OK(cli_credentials_set_secrets(cred, NULL,
secrets_ldb, NULL,
+SECRETS_LDAP_FILTER,
error_string))) {
+ ldb_asprintf_errstring(ldb, Failed to read LDAP backend
password from %s, secrets_ldb_path);
+ talloc_free(tmp_ctx);
+ return LDB_ERR_STRONG_AUTH_REQUIRED;
+ }
+
+ /*
+* Finally overwrite any supplied credentials with
+* these ones, as only secrets.ldb contains the magic
+* credentials to talk on the ldapi socket
+*/
+ if (ldb_set_opaque(ldb, credentials,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 40db563 selftest: change to src dir for panic backtrace
from 403ddac dsdb: When using an LDAP backend, force use of the password
from secrets.ldb
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 40db5637911fa6307187f2ea1f3bce951746fbec
Author: David Disseldorp dd...@samba.org
Date: Wed Sep 11 17:56:02 2013 +0200
selftest: change to src dir for panic backtrace
When running selftest against a Samba3 target, the working directory is
set to st/s3dc/share. The existing panic action script attempts
obtain a backtrace for a paniced smbd process using GDB, which does not
locate debug info relative to the working directory.
This commit changes the S3 selftest panic action to first enter
the base source directory before attempting to obtain the backtrace,
ensuring that GDB can locate the debug info.
Signed-off-by: David Disseldorp dd...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Thu Sep 12 00:19:39 CEST 2013 on sn-devel-104
---
Summary of changes:
selftest/target/Samba3.pm |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 20587bf..0972457 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -928,7 +928,7 @@ sub provision($$)
netbios name = $server
interfaces = $server_ip/8
bind interfaces only = yes
- panic action = $self-{srcdir}/selftest/gdb_backtrace %d
%\$(MAKE_TEST_BINARY)
+ panic action = cd $self-{srcdir}
$self-{srcdir}/selftest/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
smbd:suicide mode = yes
workgroup = $domain
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8f41142 smbd: Properly protect against invalid lock data
via 776db7d Fix is_legal_name() to not emit character conversion error
messages.
from 40db563 selftest: change to src dir for panic backtrace
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8f411425f6649422cb5ab94ec6ca392a02ec5ee5
Author: Volker Lendecke v...@samba.org
Date: Wed Sep 11 12:04:58 2013 +
smbd: Properly protect against invalid lock data
If someone messes with brlock.tdb and inserts an invalid record length,
this will lead to memcpy overwriting a few bytes behind malloc'ed data.
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Thu Sep 12 03:26:45 CEST 2013 on sn-devel-104
commit 776db7d38597a29536e4127837ffa3b4f4ce35ab
Author: Jeremy Allison j...@samba.org
Date: Tue Sep 10 10:46:18 2013 -0700
Fix is_legal_name() to not emit character conversion error messages.
Using next_codepoint() does the same check, but without the conversion
message.
Signed-off-by: Jeremy Allison j...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
---
Summary of changes:
source3/locking/brlock.c|6 ++
source3/smbd/mangle_hash2.c | 20
2 files changed, 14 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index ac54767..adbfc5f 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -1976,6 +1976,12 @@ static struct byte_range_lock
*brl_get_locks_internal(TALLOC_CTX *mem_ctx,
data = dbwrap_record_get_value(br_lck-record);
}
+ if ((data.dsize % sizeof(struct lock_struct)) != 0) {
+ DEBUG(3, (Got invalid brlock data\n));
+ TALLOC_FREE(br_lck);
+ return NULL;
+ }
+
br_lck-read_only = do_read_only;
br_lck-lock_data = NULL;
diff --git a/source3/smbd/mangle_hash2.c b/source3/smbd/mangle_hash2.c
index 655c727..c2910f8 100644
--- a/source3/smbd/mangle_hash2.c
+++ b/source3/smbd/mangle_hash2.c
@@ -626,21 +626,17 @@ static bool is_legal_name(const char *name)
while (*name) {
if (((unsigned int)name[0]) 128 (name[1] != 0)) {
/* Possible start of mb character. */
- char mbc[2];
size_t size = 0;
+ (void)next_codepoint(name, size);
/*
-* Note that if CH_UNIX is utf8 a string may be 3
-* bytes, but this is ok as mb utf8 characters don't
-* contain embedded ascii bytes. We are really checking
-* for mb UNIX asian characters like Japanese (SJIS)
here.
-* JRA.
+* Note that we're only looking for multibyte
+* encoding here. No encoding with a length 1
+* contains invalid characters.
*/
- if (convert_string(CH_UNIX, CH_UTF16LE, name, 2, mbc,
2, size)) {
- if (size == 2) {
- /* Was a good mb string. */
- name += 2;
- continue;
- }
+ if (size 1) {
+ /* Was a mb string. */
+ name += size;
+ continue;
}
}
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-2.4-9-gc0bb147
The branch, master has been updated via c0bb147ca09e82019b05ec22995623cffc3184e2 (commit) via 36de63843de10a1f2a9ccdbbee24cc1d08542984 (commit) via ea5576071b22e1877903ec0921d375626a23e13b (commit) via d8a76cf79f07dfb5a93c6c9a13f16e3268c7dd57 (commit) via d4e206fb818048b7fab4797c877b854bdbb1ab70 (commit) via 8753a094b97340deb26dd44f6ea345ca0a642a95 (commit) via 4a388fc6bf54636b7e1f6da8e6aa451cddd574f7 (commit) via 16fcff0d1993b7a0479341862ea44d10bd5c6d6d (commit) from 09940255011b119dc6af3304f5d3e9568e6006fd (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit c0bb147ca09e82019b05ec22995623cffc3184e2 Author: Martin Schwenke mar...@meltin.net Date: Mon Sep 9 16:16:24 2013 +1000 common: Make parse_ip() valgrind-clean Signed-off-by: Martin Schwenke mar...@meltin.net Pair-programmed-with: Amitay Isaacs ami...@gmail.com commit 36de63843de10a1f2a9ccdbbee24cc1d08542984 Author: Martin Schwenke mar...@meltin.net Date: Tue Aug 27 15:27:30 2013 +1000 recoverd: Remove an orphaned comment This should have been removed with the associated code in commit 14bd0b6961ef1294e9cba74ce875386b7dfbf446. Signed-off-by: Martin Schwenke mar...@meltin.net commit ea5576071b22e1877903ec0921d375626a23e13b Author: Martin Schwenke mar...@meltin.net Date: Tue Aug 27 15:24:17 2013 +1000 recoverd: Update a comment to use current terminology Signed-off-by: Martin Schwenke mar...@meltin.net commit d8a76cf79f07dfb5a93c6c9a13f16e3268c7dd57 Author: Martin Schwenke mar...@meltin.net Date: Tue Aug 27 15:16:51 2013 +1000 client: Remove unused function list_of_active_nodes_except_pnn() Signed-off-by: Martin Schwenke mar...@meltin.net commit d4e206fb818048b7fab4797c877b854bdbb1ab70 Author: Martin Schwenke mar...@meltin.net Date: Tue Aug 27 15:14:10 2013 +1000 tools/ctdb: list_of_active_nodes_except_pnn() - list_of_nodes() list_of_active_nodes_except_pnn() is only used here and can be removed if we remove this call. Less is more... Signed-off-by: Martin Schwenke mar...@meltin.net commit 8753a094b97340deb26dd44f6ea345ca0a642a95 Author: Martin Schwenke mar...@meltin.net Date: Wed Aug 28 15:36:27 2013 +1000 tools/ctdb: Fix a memory leak in parse_nodestring() Signed-off-by: Martin Schwenke mar...@meltin.net commit 4a388fc6bf54636b7e1f6da8e6aa451cddd574f7 Author: Martin Schwenke mar...@meltin.net Date: Fri Sep 6 16:37:52 2013 +1000 tests/eventscripts: Tests for memory checking in 00.ctdb ... plus updates to test infrastructure to support. Signed-off-by: Martin Schwenke mar...@meltin.net commit 16fcff0d1993b7a0479341862ea44d10bd5c6d6d Author: Martin Schwenke mar...@meltin.net Date: Fri Sep 6 12:13:31 2013 +1000 eventscripts: Clean up monitoring of system memory in 00.ctdb Signed-off-by: Martin Schwenke mar...@meltin.net --- Summary of changes: client/ctdb_client.c |8 --- common/ctdb_util.c|2 + config/events.d/00.ctdb | 71 + include/ctdb_client.h |4 -- server/ctdb_takeover.c| 11 ++--- tests/eventscripts/00.ctdb.monitor.001.sh | 15 ++ tests/eventscripts/00.ctdb.monitor.002.sh | 15 ++ tests/eventscripts/00.ctdb.monitor.003.sh | 19 tests/eventscripts/00.ctdb.monitor.004.sh | 17 +++ tests/eventscripts/00.ctdb.monitor.005.sh | 21 + tests/eventscripts/etc-ctdb/rc.local |3 + tests/eventscripts/scripts/local.sh | 45 ++ tests/eventscripts/stubs/ctdb | 12 - tests/eventscripts/stubs/free |9 tests/eventscripts/stubs/ps | 12 + tools/ctdb.c |7 ++- 16 files changed, 217 insertions(+), 54 deletions(-) create mode 100755 tests/eventscripts/00.ctdb.monitor.001.sh create mode 100755 tests/eventscripts/00.ctdb.monitor.002.sh create mode 100755 tests/eventscripts/00.ctdb.monitor.003.sh create mode 100755 tests/eventscripts/00.ctdb.monitor.004.sh create mode 100755 tests/eventscripts/00.ctdb.monitor.005.sh create mode 100755 tests/eventscripts/stubs/free create mode 100755 tests/eventscripts/stubs/ps Changeset truncated at 500 lines: diff --git a/client/ctdb_client.c b/client/ctdb_client.c index 8bab9bb..77147c6 100644 --- a/client/ctdb_client.c +++ b/client/ctdb_client.c @@ -3521,14 +3521,6 @@ uint32_t *list_of_active_nodes(struct ctdb_context *ctdb, include_self ? -1 : ctdb-pnn); } -uint32_t *list_of_active_nodes_except_pnn(struct ctdb_context *ctdb, - struct ctdb_node_map
