diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-05-12 09:02:47 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2020-05-12 11:06:46 +0200 |
| commit | 55842c7326b5e23cb7cb672e3ebe7aedfd08d923 (patch) | |
| tree | 7abfb9b5aaef6d157a1b684841ea63bda2396aa0 /src/home/homed-manager-bus.c | |
| parent | man: run man/update-dbus-docs again (diff) | |
| download | systemd-55842c7326b5e23cb7cb672e3ebe7aedfd08d923.tar.xz systemd-55842c7326b5e23cb7cb672e3ebe7aedfd08d923.zip | |
homed: fix parameter names on D-Bus methods
These arguments contain UserRecord structures serialized to JSON,
however only the "secret" part of it, not a whole user record. We do
this since the secret part is conceptually part of the user record and
in some contexts we need a user record in full with both secret and
non-secret part, and in others just the secret and in other just the
non-secret part, but we want to keep this in memory in the same logic.
Hence, let's rename the arguments where we expect a user record
consisting only of the secret part to "secret".
Diffstat (limited to 'src/home/homed-manager-bus.c')
| -rw-r--r-- | src/home/homed-manager-bus.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/home/homed-manager-bus.c b/src/home/homed-manager-bus.c index 6306e12d39..ce6919a1a7 100644 --- a/src/home/homed-manager-bus.c +++ b/src/home/homed-manager-bus.c @@ -661,7 +661,7 @@ static const sd_bus_vtable manager_vtable[] = { SD_BUS_METHOD_WITH_NAMES("ActivateHome", "ss", SD_BUS_PARAM(user_name) - SD_BUS_PARAM(user_record), + SD_BUS_PARAM(secret), NULL,, method_activate_home, SD_BUS_VTABLE_SENSITIVE), @@ -675,7 +675,7 @@ static const sd_bus_vtable manager_vtable[] = { /* Add the JSON record to homed, but don't create actual $HOME */ SD_BUS_METHOD_WITH_NAMES("RegisterHome", "s", - SD_BUS_PARAM(home_record), + SD_BUS_PARAM(user_record), NULL,, method_register_home, SD_BUS_VTABLE_UNPRIVILEGED), @@ -691,7 +691,7 @@ static const sd_bus_vtable manager_vtable[] = { /* Add JSON record, and create $HOME for it */ SD_BUS_METHOD_WITH_NAMES("CreateHome", "s", - SD_BUS_PARAM(home_record), + SD_BUS_PARAM(user_record), NULL,, method_create_home, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE), @@ -700,7 +700,7 @@ static const sd_bus_vtable manager_vtable[] = { SD_BUS_METHOD_WITH_NAMES("RealizeHome", "ss", SD_BUS_PARAM(user_name) - SD_BUS_PARAM(user_record), + SD_BUS_PARAM(secret), NULL,, method_realize_home, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE), @@ -717,7 +717,7 @@ static const sd_bus_vtable manager_vtable[] = { SD_BUS_METHOD_WITH_NAMES("FixateHome", "ss", SD_BUS_PARAM(user_name) - SD_BUS_PARAM(user_record), + SD_BUS_PARAM(secret), NULL,, method_fixate_home, SD_BUS_VTABLE_SENSITIVE), @@ -726,7 +726,7 @@ static const sd_bus_vtable manager_vtable[] = { SD_BUS_METHOD_WITH_NAMES("AuthenticateHome", "ss", SD_BUS_PARAM(user_name) - SD_BUS_PARAM(user_record), + SD_BUS_PARAM(secret), NULL,, method_authenticate_home, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE), @@ -743,7 +743,7 @@ static const sd_bus_vtable manager_vtable[] = { "sts", SD_BUS_PARAM(user_name) SD_BUS_PARAM(size) - SD_BUS_PARAM(user_record), + SD_BUS_PARAM(secret), NULL,, method_resize_home, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE), @@ -751,8 +751,8 @@ static const sd_bus_vtable manager_vtable[] = { SD_BUS_METHOD_WITH_NAMES("ChangePasswordHome", "sss", SD_BUS_PARAM(user_name) - SD_BUS_PARAM(new_user_record) - SD_BUS_PARAM(old_user_record), + SD_BUS_PARAM(new_secret) + SD_BUS_PARAM(old_secret), NULL,, method_change_password_home, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE), @@ -769,7 +769,7 @@ static const sd_bus_vtable manager_vtable[] = { SD_BUS_METHOD_WITH_NAMES("UnlockHome", "ss", SD_BUS_PARAM(user_name) - SD_BUS_PARAM(user_record), + SD_BUS_PARAM(secret), NULL,, method_unlock_home, SD_BUS_VTABLE_SENSITIVE), @@ -784,7 +784,7 @@ static const sd_bus_vtable manager_vtable[] = { SD_BUS_METHOD_WITH_NAMES("AcquireHome", "ssb", SD_BUS_PARAM(user_name) - SD_BUS_PARAM(user_record) + SD_BUS_PARAM(secret) SD_BUS_PARAM(please_suspend), "h", SD_BUS_PARAM(send_fd), |