chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v226: Apply missing fixes and changes to src/shared
[elogind.git]
/
src
/
shared
/
acl-util.c
diff --git
a/src/shared/acl-util.c
b/src/shared/acl-util.c
index 466f9aa601590d36a422f334da20051f99171354..ad0e481b9fcd82c7f3a1f510e880b0586383195d 100644
(file)
--- a/
src/shared/acl-util.c
+++ b/
src/shared/acl-util.c
@@
-95,6
+95,8
@@
int calc_acl_mask_if_needed(acl_t *acl_p) {
return 0;
}
return 0;
}
+/// UNNEEDED by elogind
+#if 0
int add_base_acls_if_needed(acl_t *acl_p, const char *path) {
acl_entry_t i;
int r;
int add_base_acls_if_needed(acl_t *acl_p, const char *path) {
acl_entry_t i;
int r;
@@
-223,7
+225,7
@@
int acl_search_groups(const char *path, char ***ret_groups) {
return ret;
}
return ret;
}
-int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask) {
+int parse_acl(c
onst c
har *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;
@@
-232,7
+234,7
@@
int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask)
split = strv_split(text, ",");
if (!split)
split = strv_split(text, ",");
if (!split)
- return
log_oom()
;
+ return
-ENOMEM
;
STRV_FOREACH(entry, split) {
char *p;
STRV_FOREACH(entry, split) {
char *p;
@@
-245,9
+247,9
@@
int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask)
r = strv_push(&d, p);
else
r = strv_push(&a, *entry);
r = strv_push(&d, p);
else
r = strv_push(&a, *entry);
+ if (r < 0)
+ return r;
}
}
- if (r < 0)
- return r;
if (!strv_isempty(a)) {
_cleanup_free_ char *join;
if (!strv_isempty(a)) {
_cleanup_free_ char *join;
@@
-258,7
+260,7
@@
int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask)
a_acl = acl_from_text(join);
if (!a_acl)
a_acl = acl_from_text(join);
if (!a_acl)
- return -
EINVAL
;
+ return -
errno
;
if (want_mask) {
r = calc_acl_mask_if_needed(&a_acl);
if (want_mask) {
r = calc_acl_mask_if_needed(&a_acl);
@@
-276,7
+278,7
@@
int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask)
d_acl = acl_from_text(join);
if (!d_acl)
d_acl = acl_from_text(join);
if (!d_acl)
- return -
EINVAL
;
+ return -
errno
;
if (want_mask) {
r = calc_acl_mask_if_needed(&d_acl);
if (want_mask) {
r = calc_acl_mask_if_needed(&d_acl);
@@
-288,6
+290,7
@@
int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask)
*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;
+
return 0;
}
return 0;
}
@@
-394,3
+397,4
@@
int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl) {
old = NULL;
return 0;
}
old = NULL;
return 0;
}
+#endif // 0