diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-05-20 15:19:19 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-05-20 15:19:19 +0200 |
| commit | eb75ff6338d3c0e383298a865cb4301cf4cb3223 (patch) | |
| tree | 6913c493f5892713523c1519c9f5eb80d2376e3b | |
| parent | 6f270e6bd8b78aedf9f77534d6d11141ea0bf8ca (diff) | |
| download | systemd-revert-3283-master.tar.gz | |
Revert "core/dbus: further simplify branch code"revert-3283-master
| -rw-r--r-- | src/core/dbus-execute.c | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 888319593c..0948656fe1 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -836,9 +836,11 @@ int bus_exec_context_set_transient_property( return r; if (mode != UNIT_CHECK) { - r = free_and_strdup(&c->user, uu); - if (r < 0) - return r; + + if (isempty(uu)) + c->user = mfree(c->user); + else if (free_and_strdup(&c->user, uu) < 0) + return -ENOMEM; unit_write_drop_in_private_format(u, mode, name, "User=%s\n", uu); } @@ -853,9 +855,11 @@ int bus_exec_context_set_transient_property( return r; if (mode != UNIT_CHECK) { - r = free_and_strdup(&c->group, gg); - if (r < 0) - return r; + + if (isempty(gg)) + c->group = mfree(c->group); + else if (free_and_strdup(&c->group, gg) < 0) + return -ENOMEM; unit_write_drop_in_private_format(u, mode, name, "Group=%s\n", gg); } @@ -869,9 +873,11 @@ int bus_exec_context_set_transient_property( return r; if (mode != UNIT_CHECK) { - r = free_and_strdup(&c->syslog_identifier, id); - if (r < 0) - return r; + + if (isempty(id)) + c->syslog_identifier = mfree(c->syslog_identifier); + else if (free_and_strdup(&c->syslog_identifier, id) < 0) + return -ENOMEM; unit_write_drop_in_private_format(u, mode, name, "SyslogIdentifier=%s\n", id); } @@ -1088,9 +1094,10 @@ int bus_exec_context_set_transient_property( return r; if (mode != UNIT_CHECK) { - r = free_and_strdup(&c->utmp_id, id); - if (r < 0) - return r; + if (isempty(id)) + c->utmp_id = mfree(c->utmp_id); + else if (free_and_strdup(&c->utmp_id, id) < 0) + return -ENOMEM; unit_write_drop_in_private_format(u, mode, name, "UtmpIdentifier=%s\n", strempty(id)); } @@ -1125,9 +1132,10 @@ int bus_exec_context_set_transient_property( return r; if (mode != UNIT_CHECK) { - r = free_and_strdup(&c->pam_name, n); - if (r < 0) - return r; + if (isempty(n)) + c->pam_name = mfree(c->pam_name); + else if (free_and_strdup(&c->pam_name, n) < 0) + return -ENOMEM; unit_write_drop_in_private_format(u, mode, name, "PAMName=%s\n", strempty(n)); } |