[PATCH 09/11] torture/attr: use security_ace_equal instead of sec_ace_equal

David Disseldorp ddiss at samba.org
Wed May 28 16:09:44 MDT 2014


Both offer the same functionality, sec_ace_equal() will be removed.

Signed-off-by: David Disseldorp <ddiss at samba.org>
---
 source4/torture/basic/attr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source4/torture/basic/attr.c b/source4/torture/basic/attr.c
index 2f0248e..8d51fa3 100644
--- a/source4/torture/basic/attr.c
+++ b/source4/torture/basic/attr.c
@@ -23,7 +23,7 @@
 #include "libcli/libcli.h"
 #include "torture/util.h"
 #include "system/filesys.h"
-#include "libcli/security/secace.h"
+#include "libcli/security/security_descriptor.h"
 #include "torture/basic/proto.h"
 
 extern int torture_failures;
@@ -295,7 +295,7 @@ bool torture_winattrtest(struct torture_context *tctx,
 			struct security_ace *ace1 = &sd1->dacl->aces[aceno];
 			struct security_ace *ace2 = &sd2->dacl->aces[aceno];
 
-			if(!sec_ace_equal(ace1,ace2)){
+			if (!security_ace_equal(ace1, ace2)) {
 				torture_comment(tctx,
 					"ACLs changed! Not expected!\n");
 				CHECK_MAX_FAILURES(error_exit_file);
@@ -414,7 +414,7 @@ error_exit_file:
 			struct security_ace *ace1 = &sd1->dacl->aces[aceno];
 			struct security_ace *ace2 = &sd2->dacl->aces[aceno];
 
-			if(!sec_ace_equal(ace1,ace2)){
+			if (!security_ace_equal(ace1, ace2)) {
 				torture_comment(tctx,
 					"ACLs changed! Not expected!\n");
 				CHECK_MAX_FAILURES(error_exit_dir);
-- 
1.8.4.5



More information about the samba-technical mailing list