chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: add public API call sd_journal_get_events()
[elogind.git]
/
src
/
core
/
unit-printf.c
diff --git
a/src/core/unit-printf.c
b/src/core/unit-printf.c
index 7430beb3da1598ddaf1faca3f3d5a951d6db4236..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) {
@@
-250,12
+259,13
@@
char *unit_full_printf(Unit *u, const char *format) {
* %r root cgroup path of this systemd instance (e.g. "/user/lennart/shared/systemd-4711")
* %R parent of root cgroup path (e.g. "/usr/lennart/shared")
* %t the runtime directory to place sockets in (e.g. "/run" or $XDG_RUNTIME_DIR)
* %r root cgroup path of this systemd instance (e.g. "/user/lennart/shared/systemd-4711")
* %R parent of root cgroup path (e.g. "/usr/lennart/shared")
* %t the runtime directory to place sockets in (e.g. "/run" or $XDG_RUNTIME_DIR)
+ * %U the UID of the configured user or running user
* %u the username of the configured user or running user
* %h the homedir of the configured user or running user
* %s the shell of the configured user or running user
* %m the machine ID of the running system
* %u the username of the configured user or running user
* %h the homedir of the configured user or running user
* %s the shell of the configured user or running user
* %m the machine ID of the running system
- * %b the boot ID of the running system
* %H the host name of the running system
* %H the host name of the running system
+ * %b the boot ID of the running system
*/
const Specifier table[] = {
*/
const Specifier table[] = {
@@
-282,7
+292,6
@@
char *unit_full_printf(Unit *u, const char *format) {
{ 0, NULL, NULL }
};
{ 0, NULL, NULL }
};
- assert(u);
assert(format);
return specifier_printf(format, table, u);
assert(format);
return specifier_printf(format, table, u);