X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flocale%2Flocaled.c;h=7a6a96f68fb1bbdc95876d18bbc2c517d59afb66;hb=d14ab08b29d5b0b3ead6e63ac8be472f273011f9;hp=a1e0ab6fe876e72ec2926850eee48b8ea2d0be05;hpb=63b575175efb60d6c51bae6a91be7547153fdd8d;p=elogind.git diff --git a/src/locale/localed.c b/src/locale/localed.c index a1e0ab6fe..7a6a96f68 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -948,7 +948,7 @@ static int method_set_vc_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata if ((keymap && (!filename_is_safe(keymap) || !string_is_safe(keymap))) || (keymap_toggle && (!filename_is_safe(keymap_toggle) || !string_is_safe(keymap_toggle)))) - return sd_bus_error_set_errnof(error, r, "Received invalid keymap data: %s", -EINVAL); + return sd_bus_error_set_errnof(error, -EINVAL, "Received invalid keymap data"); r = bus_verify_polkit_async(bus, &c->polkit_registry, m, "org.freedesktop.locale1.set-keyboard", @@ -1020,7 +1020,7 @@ static int method_set_x11_keyboard(sd_bus *bus, sd_bus_message *m, void *userdat (model && !string_is_safe(model)) || (variant && !string_is_safe(variant)) || (options && !string_is_safe(options))) - return sd_bus_error_set_errnof(error, r, "Received invalid keyboard data: %s", -EINVAL); + return sd_bus_error_set_errnof(error, -EINVAL, "Received invalid keyboard data"); r = bus_verify_polkit_async(bus, &c->polkit_registry, m, "org.freedesktop.locale1.set-keyboard",