X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Faudit.c;h=84181d3321fe0e8e92281671b086690defe35d62;hb=996c8e7a95a4addb0a04393fb1f45b713b39f293;hp=9ab46408da43ff99fa099ba838e300f90aabe75d;hpb=5b12334d35eadf1f45cc3d631fd1a2e72ffaea0a;p=elogind.git
diff --git a/src/shared/audit.c b/src/shared/audit.c
index 9ab46408d..84181d332 100644
--- a/src/shared/audit.c
+++ b/src/shared/audit.c
@@ -19,20 +19,14 @@
along with systemd; If not, see .
***/
-#include
-#include
-#include
#include
-#include
#include
-#include
#include "macro.h"
#include "audit.h"
#include "util.h"
-#include "log.h"
+#include "process-util.h"
#include "fileio.h"
-#include "virt.h"
int audit_session_from_pid(pid_t pid, uint32_t *id) {
_cleanup_free_ char *s = NULL;
@@ -42,14 +36,7 @@ int audit_session_from_pid(pid_t pid, uint32_t *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)
@@ -74,14 +61,7 @@ int audit_loginuid_from_pid(pid_t pid, uid_t *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)
@@ -91,9 +71,24 @@ int audit_loginuid_from_pid(pid_t pid, uid_t *uid) {
if (r < 0)
return r;
- if (u == (uid_t) -1)
- return -ENXIO;
-
*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;
+}