chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path-lookup: monitor /etc/systemd/user for user manager
[elogind.git]
/
src
/
label.c
diff --git
a/src/label.c
b/src/label.c
index b7bb03322fbc49693d8d7069a66ba523833ec862..a5994622c70ecef5e7ef03efb5e78503348a6151 100644
(file)
--- a/
src/label.c
+++ b/
src/label.c
@@
-34,12
+34,12
@@
static struct selabel_handle *label_hnd = NULL;
static inline bool use_selinux(void) {
static struct selabel_handle *label_hnd = NULL;
static inline bool use_selinux(void) {
- static int use_selinux_
in
d = -1;
+ static int use_selinux_
cache
d = -1;
- if (use_selinux_
in
d < 0)
- use_selinux_
in
d = is_selinux_enabled() > 0;
+ if (use_selinux_
cache
d < 0)
+ use_selinux_
cache
d = is_selinux_enabled() > 0;
- return use_selinux_
in
d;
+ return use_selinux_
cache
d;
}
#endif
}
#endif
@@
-48,8
+48,8
@@
int label_init(void) {
int r = 0;
#ifdef HAVE_SELINUX
int r = 0;
#ifdef HAVE_SELINUX
- usec_t
n
;
- struct mallinfo before;
+ usec_t
before_timestamp, after_timestamp
;
+ struct mallinfo before
_mallinfo, after_mallinfo
;
if (!use_selinux())
return 0;
if (!use_selinux())
return 0;
@@
-57,8
+57,8
@@
int label_init(void) {
if (label_hnd)
return 0;
if (label_hnd)
return 0;
- before = mallinfo();
-
n
= now(CLOCK_MONOTONIC);
+ before
_mallinfo
= mallinfo();
+
before_timestamp
= now(CLOCK_MONOTONIC);
label_hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
if (!label_hnd) {
label_hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
if (!label_hnd) {
@@
-66,18
+66,17
@@
int label_init(void) {
"Failed to initialize SELinux context: %m");
r = security_getenforce() == 1 ? -errno : 0;
} else {
"Failed to initialize SELinux context: %m");
r = security_getenforce() == 1 ? -errno : 0;
} else {
- char buf[FORMAT_TIMESPAN_MAX];
- struct mallinfo after;
+ char timespan[FORMAT_TIMESPAN_MAX];
int l;
int l;
-
n = now(CLOCK_MONOTONIC) - n
;
- after = mallinfo();
+
after_timestamp = now(CLOCK_MONOTONIC)
;
+ after
_mallinfo
= mallinfo();
- l = after
.uordblks > before.uordblks ? after.uordblks - before
.uordblks : 0;
+ l = after
_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo
.uordblks : 0;
log_info("Successfully loaded SELinux database in %s, size on heap is %iK.",
log_info("Successfully loaded SELinux database in %s, size on heap is %iK.",
- format_timespan(
buf, sizeof(buf), n
),
-
l
/1024);
+ format_timespan(
timespan, sizeof(timespan), after_timestamp - before_timestamp
),
+
(l+1023)
/1024);
}
#endif
}
#endif
@@
-134,7
+133,7
@@
void label_finish(void) {
#endif
}
#endif
}
-int label_get_
socket
_label_from_exe(const char *exe, char **label) {
+int label_get_
create
_label_from_exe(const char *exe, char **label) {
int r = 0;
int r = 0;