The branch, master has been updated via d9e3358 build: Fix cluster-support option, default was 'None' now 'False' via c4cd56c libcli: Fix debug message, print sid string for new_ace trustee. from 2267fad tevent: version 0.9.27
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d9e335872a4072dd2db05a8bdbfa30ceedecdfcf Author: Noel Power <noel.po...@suse.com> Date: Thu Feb 11 16:02:24 2016 +0000 build: Fix cluster-support option, default was 'None' now 'False' Cluster-support had some auto-detection but no longer does. Prior to commit id(s) e67c4b977a52d1744f4da8296bbcd7c213cbe92a & 69c0c43d55c93b82b2e398d5c61009fd347170bf cluster support was auto detected Signed-off-by: Noel Power <noel.po...@suse.com> Reviewed-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Uri Simchoni <u...@samba.org> Reviewed-by: Amitay Isaacs <ami...@gmail.com> Autobuild-User(master): Amitay Isaacs <ami...@samba.org> Autobuild-Date(master): Tue Feb 16 04:03:14 CET 2016 on sn-devel-144 commit c4cd56c484c4edd8f271524bdd8e97a9e52116e6 Author: Noel Power <noel.po...@suse.com> Date: Thu Feb 11 16:00:55 2016 +0000 libcli: Fix debug message, print sid string for new_ace trustee. Signed-off-by: Noel Power <noel.po...@suse.com> Reviewed-by: Uri Simchoni <u...@samba.org> Reviewed-by: Amitay Isaacs <ami...@gmail.com> ----------------------------------------------------------------------- Summary of changes: libcli/security/secdesc.c | 2 +- source3/wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/security/secdesc.c b/libcli/security/secdesc.c index bbad8a3..6e20e90 100644 --- a/libcli/security/secdesc.c +++ b/libcli/security/secdesc.c @@ -567,7 +567,7 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx, " inherited as %s:%d/0x%02x/0x%08x\n", dom_sid_string(frame, &ace->trustee), ace->type, ace->flags, ace->access_mask, - dom_sid_string(frame, &ace->trustee), + dom_sid_string(frame, &new_ace->trustee), new_ace->type, new_ace->flags, new_ace->access_mask)); diff --git a/source3/wscript b/source3/wscript index 8fe1374..c6fdb1b 100644 --- a/source3/wscript +++ b/source3/wscript @@ -57,7 +57,7 @@ def set_options(opt): opt.SAMBA3_ADD_OPTION('profiling-data', default=False) opt.SAMBA3_ADD_OPTION('libarchive', default=None) - opt.SAMBA3_ADD_OPTION('cluster-support', default=None) + opt.SAMBA3_ADD_OPTION('cluster-support', default=False) opt.SAMBA3_ADD_OPTION('regedit', default=None) -- Samba Shared Repository