- Make string parameter const
- Don't log some OOM errors, but not others
- Don't eat up errors generated by acl_from_text()
- Make sure check for success of every single strv_push() call
-int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask) {
+int parse_acl(const char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask) {
_cleanup_free_ char **a = NULL, **d = NULL; /* strings are not be freed */
_cleanup_strv_free_ char **split;
char **entry;
_cleanup_free_ char **a = NULL, **d = NULL; /* strings are not be freed */
_cleanup_strv_free_ char **split;
char **entry;
split = strv_split(text, ",");
if (!split)
split = strv_split(text, ",");
if (!split)
STRV_FOREACH(entry, split) {
char *p;
STRV_FOREACH(entry, split) {
char *p;
r = strv_push(&d, p);
else
r = strv_push(&a, *entry);
r = strv_push(&d, p);
else
r = strv_push(&a, *entry);
if (!strv_isempty(a)) {
_cleanup_free_ char *join;
if (!strv_isempty(a)) {
_cleanup_free_ char *join;
a_acl = acl_from_text(join);
if (!a_acl)
a_acl = acl_from_text(join);
if (!a_acl)
if (want_mask) {
r = calc_acl_mask_if_needed(&a_acl);
if (want_mask) {
r = calc_acl_mask_if_needed(&a_acl);
d_acl = acl_from_text(join);
if (!d_acl)
d_acl = acl_from_text(join);
if (!d_acl)
if (want_mask) {
r = calc_acl_mask_if_needed(&d_acl);
if (want_mask) {
r = calc_acl_mask_if_needed(&d_acl);
*acl_access = a_acl;
*acl_default = d_acl;
a_acl = d_acl = NULL;
*acl_access = a_acl;
*acl_default = d_acl;
a_acl = d_acl = NULL;
int calc_acl_mask_if_needed(acl_t *acl_p);
int add_base_acls_if_needed(acl_t *acl_p, const char *path);
int acl_search_groups(const char* path, char ***ret_groups);
int calc_acl_mask_if_needed(acl_t *acl_p);
int add_base_acls_if_needed(acl_t *acl_p, const char *path);
int acl_search_groups(const char* path, char ***ret_groups);
-int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask);
+int parse_acl(const char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask);
int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl);
/* acl_free takes multiple argument types.
int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl);
/* acl_free takes multiple argument types.