Commit 5ebb7935 authored by Wayne Davison's avatar Wayne Davison

Tweaked a variable name.

parent c50a9076
...@@ -2616,7 +2616,7 @@ int sys_acl_get_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T *tag_type_p, uint32 *b ...@@ -2616,7 +2616,7 @@ int sys_acl_get_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T *tag_type_p, uint32 *b
acl_flagset_t flagset; acl_flagset_t flagset;
acl_permset_t permset; acl_permset_t permset;
uint32 bits, fb, bb, pb; uint32 bits, fb, bb, pb;
int user_type = -1; int id_type = -1;
int rc; int rc;
if (acl_get_tag_type(entry, &tag) != 0 if (acl_get_tag_type(entry, &tag) != 0
...@@ -2625,12 +2625,12 @@ int sys_acl_get_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T *tag_type_p, uint32 *b ...@@ -2625,12 +2625,12 @@ int sys_acl_get_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T *tag_type_p, uint32 *b
|| (uup = acl_get_qualifier(entry)) == NULL) || (uup = acl_get_qualifier(entry)) == NULL)
return -1; return -1;
rc = mbr_uuid_to_id(*uup, u_g_id_p, &user_type); rc = mbr_uuid_to_id(*uup, u_g_id_p, &id_type);
acl_free(uup); acl_free(uup);
if (rc != 0) if (rc != 0)
return rc; return rc;
if (user_type == ID_TYPE_UID) if (id_type == ID_TYPE_UID)
*tag_type_p = SMB_ACL_USER; *tag_type_p = SMB_ACL_USER;
else else
*tag_type_p = SMB_ACL_GROUP; *tag_type_p = SMB_ACL_GROUP;
...@@ -2685,7 +2685,6 @@ int sys_acl_set_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tag_type, uint32 bits, ...@@ -2685,7 +2685,6 @@ int sys_acl_set_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tag_type, uint32 bits,
acl_add_flag_np(flagset, fb); acl_add_flag_np(flagset, fb);
} }
/* Highest bit in "bits" is reserved for rsync's use. */
for (pb = (1u<<1), bb = (1u<<12); bb < (1u<<25); pb *= 2, bb *= 2) { for (pb = (1u<<1), bb = (1u<<12); bb < (1u<<25); pb *= 2, bb *= 2) {
if (bits & bb) if (bits & bb)
acl_add_perm(permset, pb); acl_add_perm(permset, pb);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment