forked from pool/systemd
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
|
Based on 1f97091d3cb0887c264176b47b0a86c269acf0b5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Fri, 27 Jun 2014 18:34:37 +0200
|
||
|
|
Subject: [PATCH] main: uid_to_name() might fail due to OOM, protect against
|
||
|
|
that
|
||
|
|
|
||
|
|
---
|
||
|
|
src/core/main.c | 7 ++++---
|
||
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
--- src/core/main.c
|
||
|
|
+++ src/core/main.c 2014-07-01 12:25:17.906235000 +0000
|
||
|
|
@@ -1525,9 +1525,10 @@ int main(int argc, char *argv[]) {
|
||
|
|
log_info("Running in initial RAM disk.");
|
||
|
|
|
||
|
|
} else {
|
||
|
|
- _cleanup_free_ char *t = uid_to_name(getuid());
|
||
|
|
- log_debug(PACKAGE_STRING " running in user mode for user "UID_FMT"/%s. (" SYSTEMD_FEATURES ")",
|
||
|
|
- getuid(), t);
|
||
|
|
+ _cleanup_free_ char *t;
|
||
|
|
+
|
||
|
|
+ t = uid_to_name(getuid());
|
||
|
|
+ log_debug(PACKAGE_STRING " running in user mode for user "UID_FMT"/%s. (" SYSTEMD_FEATURES ")", getuid(), strna(t));
|
||
|
|
}
|
||
|
|
|
||
|
|
if (arg_running_as == SYSTEMD_SYSTEM && !skip_setup) {
|