Attachment 69401 Details for Bug 55518 – Fix unit_get_exec_context==NULL branch

[patch] Fix unit_get_exec_context==NULL branch

0001-ok-if-no-context.patch (text/plain), 1.30 KB, created by Oleksii Shevchuk on 2012-11-01 20:42:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleksii Shevchuk

Created: 2012-11-01 20:42:01 UTC

Size: 1.30 KB

patch

obsolete

>diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c
>index cbae45d..a8eb60a 100644
>--- a/src/core/unit-printf.c
>+++ b/src/core/unit-printf.c
>@@ -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);

Actions: View | Splinter Review

Attachments on bug 55518: 69401

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.