diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-02-17 16:44:51 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-17 16:44:51 +0900 |
| commit | 30778ead7ae2188eb6fdaca702c3ef32a4a19d02 (patch) | |
| tree | bca34e613d82b4256af1cdda042f110ad593b07b | |
| parent | 3414394e0b978501a4b0dd9c4582a60ffce238e9 (diff) | |
| parent | 0db7e17cba1da277a2074098cfffcc75062b9b2f (diff) | |
| download | systemd-30778ead7ae2188eb6fdaca702c3ef32a4a19d02.tar.gz | |
Merge pull request #22543 from poettering/logind-fix-bus-bool-prop
logind: fix some sd-bus int/bool/unsigned mixups
| -rw-r--r-- | src/login/logind-dbus.c | 10 | ||||
| -rw-r--r-- | src/login/logind.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 5ba0b1748e..cd0dcea0e5 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2058,10 +2058,10 @@ static int update_schedule_file(Manager *m) { fprintf(f, "USEC="USEC_FMT"\n" - "WARN_WALL=%i\n" + "WARN_WALL=%s\n" "MODE=%s\n", m->scheduled_shutdown_timeout, - m->enable_wall_messages, + one_zero(m->enable_wall_messages), handle_action_to_string(m->scheduled_shutdown_type->handle)); if (!isempty(m->wall_message)) { @@ -3116,7 +3116,7 @@ static int method_set_wall_message( int r; Manager *m = userdata; char *wall_message; - unsigned enable_wall_messages; + int enable_wall_messages; assert(message); assert(m); @@ -3277,13 +3277,13 @@ static int method_inhibit(sd_bus_message *message, void *userdata, sd_bus_error static const sd_bus_vtable manager_vtable[] = { SD_BUS_VTABLE_START(0), - SD_BUS_WRITABLE_PROPERTY("EnableWallMessages", "b", NULL, NULL, offsetof(Manager, enable_wall_messages), 0), + SD_BUS_WRITABLE_PROPERTY("EnableWallMessages", "b", bus_property_get_bool, bus_property_set_bool, offsetof(Manager, enable_wall_messages), 0), SD_BUS_WRITABLE_PROPERTY("WallMessage", "s", NULL, NULL, offsetof(Manager, wall_message), 0), SD_BUS_PROPERTY("NAutoVTs", "u", NULL, offsetof(Manager, n_autovts), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("KillOnlyUsers", "as", NULL, offsetof(Manager, kill_only_users), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("KillExcludeUsers", "as", NULL, offsetof(Manager, kill_exclude_users), SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_PROPERTY("KillUserProcesses", "b", NULL, offsetof(Manager, kill_user_processes), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("KillUserProcesses", "b", bus_property_get_bool, offsetof(Manager, kill_user_processes), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("RebootParameter", "s", property_get_reboot_parameter, 0, 0), SD_BUS_PROPERTY("RebootToFirmwareSetup", "b", property_get_reboot_to_firmware_setup, 0, 0), SD_BUS_PROPERTY("RebootToBootLoaderMenu", "t", property_get_reboot_to_boot_loader_menu, 0, 0), diff --git a/src/login/logind.h b/src/login/logind.h index 5647e5069c..af9af9e457 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -87,7 +87,7 @@ struct Manager { bool unlink_nologin; char *wall_message; - unsigned enable_wall_messages; + bool enable_wall_messages; sd_event_source *wall_message_timeout_source; bool shutdown_dry_run; |