mirror of
https://github.com/systemd/systemd.git
synced 2024-10-28 11:55:44 +03:00
systemd: fix argument ordering in UnsetAndSetEnvironment
Fixup for v208-615-g718db96199.
This commit is contained in:
parent
78bd12a05a
commit
eb6c7d2075
Notes:
Lennart Poettering
2014-10-24 18:00:16 +02:00
Backport: bugfix
@ -1357,18 +1357,18 @@ static int method_unset_and_set_environment(sd_bus *bus, sd_bus_message *message
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = sd_bus_message_read_strv(message, &plus);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = sd_bus_message_read_strv(message, &minus);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
if (!strv_env_is_valid(plus))
|
||||
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid environment assignments");
|
||||
r = sd_bus_message_read_strv(message, &plus);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
if (!strv_env_name_or_assignment_is_valid(minus))
|
||||
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid environment variable names or assignments");
|
||||
if (!strv_env_is_valid(plus))
|
||||
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid environment assignments");
|
||||
|
||||
r = manager_environment_add(m, minus, plus);
|
||||
if (r < 0)
|
||||
|
Loading…
Reference in New Issue
Block a user