SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "core/dbus: further simplify branch code" (#3307)

Browse Source
This commit is contained in:
Lennart Poettering
2016-05-20 23:36:22 +03:00
committed by Evgeny Vereshchagin
parent e4de3d23bb
commit 7673628066
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/dbus-execute.c
+23 -15
View File
@@ -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));
}