chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused includes
[elogind.git]
/
src
/
udev
/
udev-builtin-uaccess.c
diff --git
a/src/udev/udev-builtin-uaccess.c
b/src/udev/udev-builtin-uaccess.c
index 662bac9e0b27fed2c6c759d16c7a86545c5e7876..99bb91ae57cacafd9e1739ca453b99ca397ad3f7 100644
(file)
--- a/
src/udev/udev-builtin-uaccess.c
+++ b/
src/udev/udev-builtin-uaccess.c
@@
-20,36
+20,23
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <string.h>
-#include <ctype.h>
-#include <fcntl.h>
#include <errno.h>
#include <errno.h>
-#include <dirent.h>
-#include <getopt.h>
-#include <systemd/sd-daemon.h>
-#include <systemd/sd-login.h>
+#include "systemd/sd-login.h"
#include "logind-acl.h"
#include "udev.h"
#include "util.h"
#include "logind-acl.h"
#include "udev.h"
#include "util.h"
-static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool test)
-{
+static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool test) {
int r;
const char *path = NULL, *seat;
bool changed_acl = false;
uid_t uid;
int r;
const char *path = NULL, *seat;
bool changed_acl = false;
uid_t uid;
- log_set_target(LOG_TARGET_AUTO);
- log_parse_environment();
- log_open();
-
umask(0022);
/* don't muck around with ACLs when the system is not running systemd */
umask(0022);
/* don't muck around with ACLs when the system is not running systemd */
- if (!
sd_booted
())
+ if (!
logind_running
())
return 0;
path = udev_device_get_devnode(dev);
return 0;
path = udev_device_get_devnode(dev);
@@
-69,7
+56,7
@@
static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool
r = devnode_acl(path, true, false, 0, true, uid);
if (r < 0) {
r = devnode_acl(path, true, false, 0, true, uid);
if (r < 0) {
- log_error
("Failed to apply ACL on %s: %s", path, strerror(-r)
);
+ log_error
_errno(r, "Failed to apply ACL on %s: %m", path
);
goto finish;
}
goto finish;
}
@@
-83,7
+70,7
@@
finish:
/* Better be safe than sorry and reset ACL */
k = devnode_acl(path, true, false, 0, false, 0);
if (k < 0) {
/* Better be safe than sorry and reset ACL */
k = devnode_acl(path, true, false, 0, false, 0);
if (k < 0) {
- log_error
("Failed to apply ACL on %s: %s", path, strerror(-k)
);
+ log_error
_errno(k, "Failed to apply ACL on %s: %m", path
);
if (r >= 0)
r = k;
}
if (r >= 0)
r = k;
}
@@
-95,5
+82,5
@@
finish:
const struct udev_builtin udev_builtin_uaccess = {
.name = "uaccess",
.cmd = builtin_uaccess,
const struct udev_builtin udev_builtin_uaccess = {
.name = "uaccess",
.cmd = builtin_uaccess,
- .help = "
m
anage device node user ACL",
+ .help = "
M
anage device node user ACL",
};
};