diff options
| author | Wayne Davison <wayned@samba.org> | 2007-10-05 02:45:09 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2007-10-05 02:45:09 +0000 |
| commit | 6be5ac61bd2b4d4bdb77c26d3e8e2729a2433668 (patch) | |
| tree | d291c605fcf48e32b2c0e3f38f1aa7c31661160e /acls.c | |
| parent | 90c71caeb3c0132e8ce0213c7a4fc2e69acdc926 (diff) | |
| download | rsync-6be5ac61bd2b4d4bdb77c26d3e8e2729a2433668.tar.gz rsync-6be5ac61bd2b4d4bdb77c26d3e8e2729a2433668.tar.bz2 rsync-6be5ac61bd2b4d4bdb77c26d3e8e2729a2433668.zip | |
Simplified a SMB_ACL_NEED_SORT conditional because some preprocessors
couldn't handle an #if embedded in a macro.
Diffstat (limited to 'acls.c')
| -rw-r--r-- | acls.c | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -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 |