Attachment #114019 for bug #162664

View | Details | Raw Unified | Return to bug 162664
Collapse All | Expand All




	struct nfs4_acl * nacl;
	int is_dir = NFS4_ACL_ISFILE;
#endif
	int is_nfs = 0;

	if (!acl_obj_p)
		return -1;


		size = acl_nfs4_xattr_pack(nacl, &ext_acl_p);
		name = ACL_NFS4_XATTR;
		is_nfs = 1;
		acl_nfs4_free(nacl);
	}
#else

	if (!ext_acl_p)
		return -1;

	error = setxattr(path_p, name, (char *)ext_acl_p, size, is_nfs ? XATTR_REPLACE : 0);
	free(ext_acl_p);
	return error;
}

Return to bug 162664

Lines 50-55 Link Here

(-)libacl/acl_set_file.c.dist (-1 / +3 lines)
50	struct nfs4_acl * nacl;	50	struct nfs4_acl * nacl;
51	int is_dir = NFS4_ACL_ISFILE;	51	int is_dir = NFS4_ACL_ISFILE;
52	#endif	52	#endif
		53	int is_nfs = 0;
53		54
54	if (!acl_obj_p)	55	if (!acl_obj_p)
55	return -1;	56	return -1;
Lines 111-116 Link Here
111		112
112	size = acl_nfs4_xattr_pack(nacl, &ext_acl_p);	113	size = acl_nfs4_xattr_pack(nacl, &ext_acl_p);
113	name = ACL_NFS4_XATTR;	114	name = ACL_NFS4_XATTR;
		115	is_nfs = 1;
114	acl_nfs4_free(nacl);	116	acl_nfs4_free(nacl);
115	}	117	}
116	#else	118	#else
Lines 133-139 Link Here
133	if (!ext_acl_p)	135	if (!ext_acl_p)
134	return -1;	136	return -1;
135		137
136	error = setxattr(path_p, name, (char *)ext_acl_p, size, XATTR_REPLACE);	138	error = setxattr(path_p, name, (char *)ext_acl_p, size, is_nfs ? XATTR_REPLACE : 0);
137	free(ext_acl_p);	139	free(ext_acl_p);
138	return error;	140	return error;
139	}	141	}