chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
everywhere: remove configurability of sysv runlevel to target mapping
[elogind.git]
/
src
/
shared
/
audit.c
diff --git
a/src/shared/audit.c
b/src/shared/audit.c
index 9ab46408da43ff99fa099ba838e300f90aabe75d..4701c0a8de856548d1eb7b8e0d31dd9304636872 100644
(file)
--- a/
src/shared/audit.c
+++ b/
src/shared/audit.c
@@
-42,14
+42,7
@@
int audit_session_from_pid(pid_t pid, uint32_t *id) {
assert(id);
assert(id);
- /* Audit doesn't support containers right now */
- if (detect_container(NULL) > 0)
- return -ENOTSUP;
-
- if (pid == 0)
- p = "/proc/self/sessionid";
- else
- p = procfs_file_alloca(pid, "sessionid");
+ p = procfs_file_alloca(pid, "sessionid");
r = read_one_line_file(p, &s);
if (r < 0)
r = read_one_line_file(p, &s);
if (r < 0)
@@
-74,14
+67,7
@@
int audit_loginuid_from_pid(pid_t pid, uid_t *uid) {
assert(uid);
assert(uid);
- /* Audit doesn't support containers right now */
- if (detect_container(NULL) > 0)
- return -ENOTSUP;
-
- if (pid == 0)
- p = "/proc/self/loginuid";
- else
- p = procfs_file_alloca(pid, "loginuid");
+ p = procfs_file_alloca(pid, "loginuid");
r = read_one_line_file(p, &s);
if (r < 0)
r = read_one_line_file(p, &s);
if (r < 0)
@@
-91,9
+77,24
@@
int audit_loginuid_from_pid(pid_t pid, uid_t *uid) {
if (r < 0)
return r;
if (r < 0)
return r;
- if (u == (uid_t) -1)
- return -ENXIO;
-
*uid = (uid_t) u;
return 0;
}
*uid = (uid_t) u;
return 0;
}
+
+bool use_audit(void) {
+ static int cached_use = -1;
+
+ if (cached_use < 0) {
+ int fd;
+
+ fd = socket(AF_NETLINK, SOCK_RAW|SOCK_CLOEXEC|SOCK_NONBLOCK, NETLINK_AUDIT);
+ if (fd < 0)
+ cached_use = errno != EAFNOSUPPORT && errno != EPROTONOSUPPORT;
+ else {
+ cached_use = true;
+ safe_close(fd);
+ }
+ }
+
+ return cached_use;
+}