From: Wayne Davison <wayned@samba.org>
Date: Fri, 5 Oct 2007 02:45:09 +0000 (+0000)
Subject: Simplified a SMB_ACL_NEED_SORT conditional because some preprocessors
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/6be5ac61bd2b4d4bdb77c26d3e8e2729a2433668

Simplified a SMB_ACL_NEED_SORT conditional because some preprocessors
couldn't handle an #if embedded in a macro.
---

diff --git a/acls.c b/acls.c
index 4fc46d3f..6cbd80ab 100644
--- a/acls.c
+++ b/acls.c
@@ -390,13 +390,10 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_acl, const rsync_acl *racl)
 			break;
 #endif
 		COE( sys_acl_create_entry,(smb_acl, &entry) );
-		COE( sys_acl_set_info,(entry,
-#ifdef SMB_ACL_NEED_SORT
-				       SMB_ACL_USER,
-#else
-				       ida->access & NAME_IS_USER ? SMB_ACL_USER : SMB_ACL_GROUP,
-#endif
-				       ida->access & ~NAME_IS_USER, ida->id) );
+		COE( sys_acl_set_info,
+		    (entry,
+		     ida->access & NAME_IS_USER ? SMB_ACL_USER : SMB_ACL_GROUP,
+		     ida->access & ~NAME_IS_USER, ida->id) );
 	}
 
 #ifndef HAVE_OSX_ACLS