diff options
Diffstat (limited to 'src/hostname')
| -rw-r--r-- | src/hostname/hostnamed.c | 107 |
1 files changed, 45 insertions, 62 deletions
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index ce2230c93a..5f09e6d0eb 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -1284,68 +1284,51 @@ static const sd_bus_vtable hostname_vtable[] = { SD_BUS_PROPERTY("HardwareModel", "s", property_get_hardware_model, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("FirmwareVersion", "s", property_get_firmware_version, 0, SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_METHOD_WITH_NAMES("SetHostname", - "sb", - SD_BUS_PARAM(hostname) - SD_BUS_PARAM(interactive), - NULL,, - method_set_hostname, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("SetStaticHostname", - "sb", - SD_BUS_PARAM(hostname) - SD_BUS_PARAM(interactive), - NULL,, - method_set_static_hostname, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("SetPrettyHostname", - "sb", - SD_BUS_PARAM(hostname) - SD_BUS_PARAM(interactive), - NULL,, - method_set_pretty_hostname, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("SetIconName", - "sb", - SD_BUS_PARAM(icon) - SD_BUS_PARAM(interactive), - NULL,, - method_set_icon_name, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("SetChassis", - "sb", - SD_BUS_PARAM(chassis) - SD_BUS_PARAM(interactive), - NULL,, - method_set_chassis, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("SetDeployment", - "sb", - SD_BUS_PARAM(deployment) - SD_BUS_PARAM(interactive), - NULL,, - method_set_deployment, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("SetLocation", - "sb", - SD_BUS_PARAM(location) - SD_BUS_PARAM(interactive), - NULL,, - method_set_location, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetProductUUID", - "b", - SD_BUS_PARAM(interactive), - "ay", - SD_BUS_PARAM(uuid), - method_get_product_uuid, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetHardwareSerial", - NULL,, - "s", - SD_BUS_PARAM(serial), - method_get_hardware_serial, - SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("SetHostname", + SD_BUS_ARGS("s", hostname, "b", interactive), + SD_BUS_NO_RESULT, + method_set_hostname, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("SetStaticHostname", + SD_BUS_ARGS("s", hostname, "b", interactive), + SD_BUS_NO_RESULT, + method_set_static_hostname, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("SetPrettyHostname", + SD_BUS_ARGS("s", hostname, "b", interactive), + SD_BUS_NO_RESULT, + method_set_pretty_hostname, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("SetIconName", + SD_BUS_ARGS("s", icon, "b", interactive), + SD_BUS_NO_RESULT, + method_set_icon_name, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("SetChassis", + SD_BUS_ARGS("s", chassis, "b", interactive), + SD_BUS_NO_RESULT, + method_set_chassis, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("SetDeployment", + SD_BUS_ARGS("s", deployment, "b", interactive), + SD_BUS_NO_RESULT, + method_set_deployment, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("SetLocation", + SD_BUS_ARGS("s", location, "b", interactive), + SD_BUS_NO_RESULT, + method_set_location, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetProductUUID", + SD_BUS_ARGS("b", interactive), + SD_BUS_RESULT("ay", uuid), + method_get_product_uuid, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetHardwareSerial", + SD_BUS_NO_ARGS, + SD_BUS_RESULT("s", serial), + method_get_hardware_serial, + SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD_WITH_ARGS("Describe", SD_BUS_NO_ARGS, SD_BUS_RESULT("s", json), |