chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dhcp: Add function to free DHCP client data
[elogind.git]
/
src
/
login
/
logind-acl.c
diff --git
a/src/login/logind-acl.c
b/src/login/logind-acl.c
index 390b4b28857f77094ae63020c0d7c6f0f0a27820..2df2ba2c17fb0b38f0d3d81efe39390ecda18f2a 100644
(file)
--- a/
src/login/logind-acl.c
+++ b/
src/login/logind-acl.c
@@
-20,15
+20,15
@@
***/
#include <assert.h>
***/
#include <assert.h>
-#include <sys/acl.h>
-#include <acl/libacl.h>
#include <errno.h>
#include <string.h>
#include <errno.h>
#include <string.h>
+#include <sys/acl.h>
+#include <acl/libacl.h>
-#include "logind-acl.h"
#include "util.h"
#include "acl-util.h"
#include "set.h"
#include "util.h"
#include "acl-util.h"
#include "set.h"
+#include "logind-acl.h"
static int flush_acl(acl_t acl) {
acl_entry_t i;
static int flush_acl(acl_t acl) {
acl_entry_t i;
@@
-190,9
+190,8
@@
int devnode_acl_all(struct udev *udev,
assert(udev);
nodes = set_new(string_hash_func, string_compare_func);
assert(udev);
nodes = set_new(string_hash_func, string_compare_func);
- if (!nodes)
{
+ if (!nodes)
return -ENOMEM;
return -ENOMEM;
- }
e = udev_enumerate_new(udev);
if (!e) {
e = udev_enumerate_new(udev);
if (!e) {
@@
-275,9
+274,9
@@
int devnode_acl_all(struct udev *udev,
log_debug("Found static node %s for seat %s", n, seat);
r = set_put(nodes, n);
log_debug("Found static node %s for seat %s", n, seat);
r = set_put(nodes, n);
- if (
0 && r < 0 && r != -EEXIST) {
+ if (
r < 0 && r != -EEXIST)
goto finish;
goto finish;
-
}
else
+ else
r = 0;
}
}
r = 0;
}
}