X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Faudit.c;h=546644773720934a18412394fb7d3687567eed3e;hp=38500591320fb27e6b1d5a23303d2b69177ff843;hb=bdd13f6be4b588568683a1ab54f421fc6a636dbb;hpb=d7832d2c6e0ef5f2839a2296c1cc2fc85c7d9632
diff --git a/src/shared/audit.c b/src/shared/audit.c
index 385005913..546644773 100644
--- a/src/shared/audit.c
+++ b/src/shared/audit.c
@@ -6,16 +6,16 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
***/
@@ -26,92 +26,59 @@
#include
#include
#include
-#include
-#include
#include "macro.h"
#include "audit.h"
#include "util.h"
#include "log.h"
+#include "fileio.h"
+#include "virt.h"
int audit_session_from_pid(pid_t pid, uint32_t *id) {
- char *s;
+ _cleanup_free_ char *s = NULL;
+ const char *p;
uint32_t u;
int r;
assert(id);
- if (have_effective_cap(CAP_AUDIT_CONTROL) <= 0)
- return -ENOENT;
-
- if (pid == 0)
- r = read_one_line_file("/proc/self/sessionid", &s);
- else {
- char *p;
-
- if (asprintf(&p, "/proc/%lu/sessionid", (unsigned long) pid) < 0)
- return -ENOMEM;
-
- r = read_one_line_file(p, &s);
- free(p);
- }
+ p = procfs_file_alloca(pid, "sessionid");
+ r = read_one_line_file(p, &s);
if (r < 0)
return r;
r = safe_atou32(s, &u);
- free(s);
-
if (r < 0)
return r;
if (u == (uint32_t) -1 || u <= 0)
- return -ENOENT;
+ return -ENXIO;
*id = u;
return 0;
}
int audit_loginuid_from_pid(pid_t pid, uid_t *uid) {
- char *s;
+ _cleanup_free_ char *s = NULL;
+ const char *p;
uid_t u;
int r;
assert(uid);
- /* Only use audit login uid if we are executed with sufficient
- * capabilities so that pam_loginuid could do its job. If we
- * are lacking the CAP_AUDIT_CONTROL capabality we most likely
- * are being run in a container and /proc/self/loginuid is
- * useless since it probably contains a uid of the host
- * system. */
-
- if (have_effective_cap(CAP_AUDIT_CONTROL) <= 0)
- return -ENOENT;
-
- if (pid == 0)
- r = read_one_line_file("/proc/self/loginuid", &s);
- else {
- char *p;
-
- if (asprintf(&p, "/proc/%lu/loginuid", (unsigned long) pid) < 0)
- return -ENOMEM;
-
- r = read_one_line_file(p, &s);
- free(p);
- }
+ p = procfs_file_alloca(pid, "loginuid");
+ r = read_one_line_file(p, &s);
if (r < 0)
return r;
r = parse_uid(s, &u);
- free(s);
-
if (r < 0)
return r;
if (u == (uid_t) -1)
- return -ENOENT;
+ return -ENXIO;
*uid = (uid_t) u;
return 0;