chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tree-wide: sort includes in *.h
[elogind.git]
/
src
/
login
/
logind-acl.c
diff --git
a/src/login/logind-acl.c
b/src/login/logind-acl.c
index f7c6f3a4efe17b7dcf1ef07548e275c4bf88cd5b..d0dd569a03cf96490a8639f968b983d2cb923f65 100644
(file)
--- a/
src/login/logind-acl.c
+++ b/
src/login/logind-acl.c
@@
-19,17
+19,20
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <assert.h>
#include <errno.h>
#include <string.h>
#include <errno.h>
#include <string.h>
-#include <sys/acl.h>
-#include <acl/libacl.h>
-#include "util.h"
#include "acl-util.h"
#include "acl-util.h"
-#include "set.h"
+#include "alloc-util.h"
+#include "dirent-util.h"
+#include "escape.h"
+#include "fd-util.h"
+#include "formats-util.h"
#include "logind-acl.h"
#include "logind-acl.h"
+#include "set.h"
+#include "string-util.h"
#include "udev-util.h"
#include "udev-util.h"
+#include "util.h"
static int flush_acl(acl_t acl) {
acl_entry_t i;
static int flush_acl(acl_t acl) {
acl_entry_t i;
@@
-256,8
+259,7
@@
int devnode_acl_all(struct udev *udev,
FOREACH_DIRENT(dent, dir, return -errno) {
_cleanup_free_ char *unescaped_devname = NULL;
FOREACH_DIRENT(dent, dir, return -errno) {
_cleanup_free_ char *unescaped_devname = NULL;
- unescaped_devname = cunescape(dent->d_name);
- if (!unescaped_devname)
+ if (cunescape(dent->d_name, UNESCAPE_RELAX, &unescaped_devname) < 0)
return -ENOMEM;
n = strappend("/dev/", unescaped_devname);
return -ENOMEM;
n = strappend("/dev/", unescaped_devname);