X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Faudit.c;h=f101050825384ff43e5b8e1f711dfc6c93f21e09;hb=30d7c9c472bd7be1b6a09d3bd5afd939988de990;hp=9ab46408da43ff99fa099ba838e300f90aabe75d;hpb=5b12334d35eadf1f45cc3d631fd1a2e72ffaea0a;p=elogind.git

diff --git a/src/shared/audit.c b/src/shared/audit.c
index 9ab46408d..f10105082 100644
--- 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);
 
-        /* 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 +67,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 +77,6 @@ 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;
 }