chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
74b9113
)
uaccess: become a nop when not run on a systemd system
author
Lennart Poettering
<lennart@poettering.net>
Thu, 14 Jul 2011 20:51:19 +0000
(22:51 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 14 Jul 2011 20:51:28 +0000
(22:51 +0200)
src/uaccess.c
patch
|
blob
|
history
diff --git
a/src/uaccess.c
b/src/uaccess.c
index 435471e91a7fde6c053c7615494ca21d5b0422a1..a9713a5023cb751cbfc6ec07ceb80ef7b2342dec 100644
(file)
--- a/
src/uaccess.c
+++ b/
src/uaccess.c
@@
-25,6
+25,7
@@
#include "logind-acl.h"
#include "util.h"
#include "log.h"
+#include "sd-daemon.h"
int main(int argc, char *argv[]) {
int r;
@@
-43,6
+44,11
@@
int main(int argc, char *argv[]) {
goto finish;
}
+ /* Make sure we don't muck around with ACLs the system is not
+ * running systemd. */
+ if (!sd_booted())
+ return 0;
+
path = argv[1];
seat = argc < 3 || isempty(argv[2]) ? "seat0" : argv[2];