chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: rename KDBUS_CMD_FNAME_POLICY_NONE -> KDBUS_CMD_FNAME_POLICY_OPEN
[elogind.git]
/
src
/
core
/
unit-printf.c
diff --git
a/src/core/unit-printf.c
b/src/core/unit-printf.c
index 7415824cdfc1a0cfc7be6811bac96a38b110fbf3..98274ee35d41fabe3c749d131ba2efb0c965e38f 100644
(file)
--- a/
src/core/unit-printf.c
+++ b/
src/core/unit-printf.c
@@
-190,28
+190,37
@@
static char *specifier_user_shell(char specifier, void *data, void *userdata) {
ExecContext *c;
int r;
const char *username, *shell;
ExecContext *c;
int r;
const char *username, *shell;
+ char *ret;
assert(u);
c = unit_get_exec_context(u);
assert(u);
c = unit_get_exec_context(u);
- /* return HOME if set, otherwise from passwd */
- if (!c || !c->user) {
- char *sh;
+ if (c && c->user)
+ username = c->user;
+ else
+ username = "root";
- r = get_shell(&sh);
- if (r < 0)
- return strdup("/bin/sh");
+ /* return /bin/sh for root, otherwise the value from passwd */
+ r = get_user_creds(&username, NULL, NULL, NULL, &shell);
+ if (r < 0) {
+ log_warning_unit(u->id,
+ "Failed to determine shell: %s",
+ strerror(-r));
+ return NULL;
+ }
- return sh;
+ if (!path_is_absolute(shell)) {
+ log_warning_unit(u->id,
+ "Shell %s is not absolute, ignoring.",
+ shell);
}
}
- username = c->user;
- r = get_user_creds(&username, NULL, NULL, NULL, &shell);
- if (r < 0)
- return strdup("/bin/sh");
+ ret = strdup(shell);
+ if (!ret)
+ log_oom();
- return
strdup(shell)
;
+ return
ret
;
}
char *unit_name_printf(Unit *u, const char* format) {
}
char *unit_name_printf(Unit *u, const char* format) {