picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: fix %h, %s, %p handling in templates in user session

This commit is contained in:
Oleksii Shevchuk 2012-11-03 21:51:59 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent f09a7d2554
commit 774de5a97f
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/unit-printf.c
View File

@ -127,11 +127,9 @@ static char *specifier_user_name(char specifier, void *data, void *userdata) {
assert(u);
c = unit_get_exec_context(u);
if (!c)
return NULL;
/* get USER env from our own env if set */
if (!c->user)
if (!c || !c->user)
return getusername_malloc();
/* fish username from passwd */
@ -152,11 +150,9 @@ static char *specifier_user_home(char specifier, void *data, void *userdata) {
assert(u);
c = unit_get_exec_context(u);
if (!c)
return NULL;
/* return HOME if set, otherwise from passwd */
if (!c->user) {
if (!c || !c->user) {
char *h;
r = get_home_dir(&h);
@ -183,11 +179,9 @@ static char *specifier_user_shell(char specifier, void *data, void *userdata) {
assert(u);
c = unit_get_exec_context(u);
if (!c)
return NULL;
/* return HOME if set, otherwise from passwd */
if (!c->user) {
if (!c || !c->user) {
char *sh;
r = get_shell(&sh);