SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logind: add shutdown/suspend/idle inhibition framework

Browse Source
This commit is contained in:
Lennart Poettering
2012-04-16 18:59:08 +02:00
parent 9156e799a2
commit f8e2fb7b14
16 changed files with 1087 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/dbus-common.c
+50
View File
@@ -1155,3 +1155,53 @@ DBusHandlerResult bus_exit_idle_filter(DBusConnection *bus, DBusMessage *m, void
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
/* This mimics dbus_bus_get_unix_user() */
pid_t bus_get_unix_process_id(
DBusConnection *connection,
const char *name,
DBusError *error) {
DBusMessage *m = NULL, *reply = NULL;
uint32_t pid = 0;
m = dbus_message_new_method_call(
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
"GetConnectionUnixProcessID");
if (!m) {
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, NULL);
goto finish;
}
if (!dbus_message_append_args(
m,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_INVALID)) {
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, NULL);
goto finish;
}
reply = dbus_connection_send_with_reply_and_block(connection, m, -1, error);
if (!reply)
goto finish;
if (dbus_set_error_from_message(error, reply))
goto finish;
if (!dbus_message_get_args(
reply, error,
DBUS_TYPE_UINT32, &pid,
DBUS_TYPE_INVALID))
goto finish;
finish:
if (m)
dbus_message_unref(m);
if (reply)
dbus_message_unref(reply);
return (pid_t) pid;
}
src/shared/dbus-common.h
+2
View File
@@ -199,4 +199,6 @@ void bus_async_unregister_and_exit(DBusConnection *bus, const char *name);
DBusHandlerResult bus_exit_idle_filter(DBusConnection *bus, DBusMessage *m, void *userdata);
pid_t bus_get_unix_process_id(DBusConnection *connection, const char *name, DBusError *error);
#endif
src/shared/polkit.c
+1 -51
View File
@@ -27,56 +27,6 @@
#include "dbus-common.h"
#include "polkit.h"
/* This mimics dbus_bus_get_unix_user() */
static pid_t get_unix_process_id(
DBusConnection *connection,
const char *name,
DBusError *error) {
DBusMessage *m = NULL, *reply = NULL;
uint32_t pid = 0;
m = dbus_message_new_method_call(
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
"GetConnectionUnixProcessID");
if (!m) {
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, NULL);
goto finish;
}
if (!dbus_message_append_args(
m,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_INVALID)) {
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, NULL);
goto finish;
}
reply = dbus_connection_send_with_reply_and_block(connection, m, -1, error);
if (!reply)
goto finish;
if (dbus_set_error_from_message(error, reply))
goto finish;
if (!dbus_message_get_args(
reply, error,
DBUS_TYPE_UINT32, &pid,
DBUS_TYPE_INVALID))
goto finish;
finish:
if (m)
dbus_message_unref(m);
if (reply)
dbus_message_unref(reply);
return (pid_t) pid;
}
int verify_polkit(
DBusConnection *c,
DBusMessage *request,
@@ -104,7 +54,7 @@ int verify_polkit(
if (!sender)
return -EINVAL;
pid_raw = get_unix_process_id(c, sender, error);
pid_raw = bus_get_unix_process_id(c, sender, error);
if (pid_raw == 0)
return -EINVAL;
src/shared/util.c
+2 -1
View File
@@ -1690,7 +1690,8 @@ char *cescape(const char *s) {
/* Does C style string escaping. */
if (!(r = new(char, strlen(s)*4 + 1)))
r = new(char, strlen(s)*4 + 1);
if (!r)
return NULL;
for (f = s, t = r; *f; f++)