X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-acl.c;h=0cef88a82de98501aff137592a9690c3b0d0f6ce;hb=07045a1a92c839fd2af80bd0c060a595021bc3b3;hp=f7c6f3a4efe17b7dcf1ef07548e275c4bf88cd5b;hpb=d5099efc47d4e6ac60816b5381a5f607ab03f06e;p=elogind.git
diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index f7c6f3a4e..0cef88a82 100644
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
@@ -19,17 +17,20 @@
along with systemd; If not, see .
***/
-#include
#include
#include
-#include
-#include
-#include "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 "set.h"
+#include "string-util.h"
#include "udev-util.h"
+#include "util.h"
static int flush_acl(acl_t acl) {
acl_entry_t i;
@@ -256,8 +257,7 @@ int devnode_acl_all(struct udev *udev,
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);