Couple of misc patches

Noel Power nopower at suse.com
Thu Feb 11 16:20:36 UTC 2016


Hi,

please find attached some minor fixes for some things I came across

Noel
-------------- next part --------------
From 8256317a382bbe54c76def43226bdc0d8cc212f4 Mon Sep 17 00:00:00 2001
From: Noel Power <noel.power at suse.com>
Date: Thu, 11 Feb 2016 16:02:24 +0000
Subject: [PATCH 2/2] Fix cluster-support option default was 'None' now 'False'

Cluster-support used be enabled some auto-detection but no longer is

Prior to commit id(s) e67c4b977a52d1744f4da8296bbcd7c213cbe92a &
 69c0c43d55c93b82b2e398d5c61009fd347170bf cluster support was auto detected

Signed-off-by: Noel Power <noel.power at suse.com>
---
 source3/wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/wscript b/source3/wscript
index d9e10c0..e96eaf0 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)
 
-- 
2.1.4

-------------- next part --------------
From 4b043ba10f08049653b3d0ba9240239d66881b53 Mon Sep 17 00:00:00 2001
From: Noel Power <noel.power at suse.com>
Date: Thu, 11 Feb 2016 16:00:55 +0000
Subject: [PATCH 1/2] Fix debug message, print sid string for new_ace trustee.

Signed-off-by: Noel Power <noel.power at suse.com>
---
 libcli/security/secdesc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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));
 
-- 
2.1.4



More information about the samba-technical mailing list