diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-05-12 16:14:44 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-05-12 16:14:44 +0200 |
| commit | 88a07670cfa974a605c7c7b520b8a3135fce37f9 (patch) | |
| tree | 8a375e1425abc9cd4a12e9f2af13a0be1a61790f | |
| parent | bd118f8e2262d5703120442aa48bd942d2116b75 (diff) | |
hostnamed: SetPrettyHostname() should check PK action org.freedesktop.hostname1.set-static-hostname
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | src/hostnamed.c | 8 | ||||
| -rw-r--r-- | src/org.freedesktop.hostname1.policy | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -19,6 +19,9 @@ F15 External: Features: +* Make it possible to set the keymap independently from the font on + the kernel cmdline. Right now setting one resets also the other. + * make use of TIOCVHANGUP * move /selinux to /sys/fs/selinux diff --git a/src/hostnamed.c b/src/hostnamed.c index 8c0035a037..91a82c8255 100644 --- a/src/hostnamed.c +++ b/src/hostnamed.c @@ -568,7 +568,13 @@ static DBusHandlerResult hostname_message_handler( if (!streq_ptr(name, data[k])) { - r = verify_polkit(connection, message, "org.freedesktop.hostname1.set-machine-info", interactive, &error); + /* Since the pretty hostname should always be + * changed at the same time as the static one, + * use the same policy action for both... */ + + r = verify_polkit(connection, message, k == PROP_PRETTY_HOSTNAME ? + "org.freedesktop.hostname1.set-static-hostname" : + "org.freedesktop.hostname1.set-machine-info", interactive, &error); if (r < 0) return bus_send_error_reply(connection, message, &error, r); diff --git a/src/org.freedesktop.hostname1.policy b/src/org.freedesktop.hostname1.policy index 148874fc89..0ad64d9ee1 100644 --- a/src/org.freedesktop.hostname1.policy +++ b/src/org.freedesktop.hostname1.policy @@ -28,7 +28,7 @@ <action id="org.freedesktop.hostname1.set-static-hostname"> <description>Set static host name</description> - <message>Authentication is required to set the statically configured local host name.</message> + <message>Authentication is required to set the statically configured local host name, as well as the pretty host name.</message> <defaults> <allow_any>auth_admin_keep</allow_any> <allow_inactive>auth_admin_keep</allow_inactive> |