summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-03-26 19:37:14 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-03-26 23:49:44 -0400
commit3baed19327663d012c3313b72cc5b3d02a58720a (patch)
tree6a55c48aa5c3a9b5cfb277f235ff8e97d7af2b10 /src/core
parenta63a5c4687d192d89eea9715db2a56c810111de8 (diff)
Simplify the meaning of %s
The rules governing %s where just too complicated. First of all, looking at $SHELL is dangerous. For systemd --system, it usually wouldn't be set. But it could be set if the admin first started a debug shell, let's say /sbin/sash, and then launched systemd from it. This shouldn't influence how daemons are started later on, so is better ignored. Similar reasoning holds for session mode. Some shells set $SHELL, while other set it only when it wasn't set previously (e.g. zsh). This results in fragility that is better avoided by ignoring $SHELL totally. With $SHELL out of the way, simplify things by saying that %s==/bin/sh for root, and the configured shell otherwise. get_shell() is the only caller, so it can be inlined. Fixes one issue seen with 'make check'.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/unit-printf.c33
1 files changed, 21 insertions, 12 deletions
diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c
index 7415824cdf..98274ee35d 100644
--- 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;
+ char *ret;
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) {