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 (parent:
4bf2bbb
)
uaccess: port over to using sd-login
author
Lennart Poettering
<lennart@poettering.net>
Fri, 22 Jul 2011 22:48:11 +0000
(
00:48
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 22 Jul 2011 22:48:11 +0000
(
00:48
+0200)
src/uaccess.c
patch
|
blob
|
history
diff --git
a/src/uaccess.c
b/src/uaccess.c
index a9713a5023cb751cbfc6ec07ceb80ef7b2342dec..786f0ef6418b71e2611e28b7f7b4e659134c39b7 100644
(file)
--- a/
src/uaccess.c
+++ b/
src/uaccess.c
@@
-26,13
+26,13
@@
#include "util.h"
#include "log.h"
#include "sd-daemon.h"
#include "util.h"
#include "log.h"
#include "sd-daemon.h"
+#include "sd-login.h"
int main(int argc, char *argv[]) {
int r;
const char *path = NULL, *seat;
int main(int argc, char *argv[]) {
int r;
const char *path = NULL, *seat;
- char *p, *active_uid = NULL;
- unsigned long ul;
bool changed_acl = false;
bool changed_acl = false;
+ uid_t uid;
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
@@
-52,44
+52,23
@@
int main(int argc, char *argv[]) {
path = argv[1];
seat = argc < 3 || isempty(argv[2]) ? "seat0" : argv[2];
path = argv[1];
seat = argc < 3 || isempty(argv[2]) ? "seat0" : argv[2];
- p = strappend("/run/systemd/seats/", seat);
- if (!p) {
- log_error("Out of memory.");
- r = -ENOMEM;
+ r = sd_seat_get_active(seat, NULL, &uid);
+ if (r == -ENOENT) {
+ /* No active session on this seat */
+ r = 0;
+ goto finish;
+ } else if (r < 0) {
+ log_error("Failed to determine active user on seat %s.", seat);
goto finish;
}
goto finish;
}
- r = parse_env_file(p, NEWLINE,
- "ACTIVE_UID", &active_uid,
- NULL);
- free(p);
-
+ r = devnode_acl(path, true, false, 0, true, uid);
if (r < 0) {
if (r < 0) {
- if (errno == ENOENT) {
- r = 0;
- goto finish;
- }
-
- log_error("Failed to read seat data for %s: %s", seat, strerror(-r));
+ log_error("Failed to apply ACL on %s: %s", path, strerror(-r));
goto finish;
}
goto finish;
}
- if (active_uid) {
- r = safe_atolu(active_uid, &ul);
- if (r < 0) {
- log_error("Failed to parse active UID value %s: %s", active_uid, strerror(-r));
- goto finish;
- }
-
- r = devnode_acl(path, true, false, 0, true, (uid_t) ul);
- if (r < 0) {
- log_error("Failed to apply ACL on %s: %s", path, strerror(-r));
- goto finish;
- }
-
- changed_acl = true;
- }
-
+ changed_acl = true;
r = 0;
finish:
r = 0;
finish:
@@
-105,7
+84,5
@@
finish:
}
}
}
}
- free(active_uid);
-
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}