summaryrefslogtreecommitdiff
path: root/src/core/selinux-access.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-11-19 21:12:59 +0100
committerLennart Poettering <lennart@poettering.net>2013-11-20 20:52:36 +0100
commit718db96199eb307751264e4163555662c9a389fa (patch)
tree9ec8467596ba1acba76bb6273c7797baf68c1a00 /src/core/selinux-access.h
parent3febea3a0b0a968ea281e7959c1654cbaf95c9bf (diff)
core: convert PID 1 to libsystemd-bus
This patch converts PID 1 to libsystemd-bus and thus drops the dependency on libdbus. The only remaining code using libdbus is a test case that validates our bus marshalling against libdbus' marshalling, and this dependency can be turned off. This patch also adds a couple of things to libsystem-bus, that are necessary to make the port work: - Synthesizing of "Disconnected" messages when bus connections are severed. - Support for attaching multiple vtables for the same interface on the same path. This patch also fixes the SetDefaultTarget() and GetDefaultTarget() bus calls which used an inappropriate signature. As a side effect we will now generate PropertiesChanged messages which carry property contents, rather than just invalidation information.
Diffstat (limited to 'src/core/selinux-access.h')
-rw-r--r--src/core/selinux-access.h38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h
index 2d7ac64c8f..0926a5eb09 100644
--- a/src/core/selinux-access.h
+++ b/src/core/selinux-access.h
@@ -21,42 +21,42 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <dbus.h>
+#include "sd-bus.h"
+#include "bus-error.h"
+#include "bus-util.h"
void selinux_access_free(void);
-int selinux_access_check(DBusConnection *connection, DBusMessage *message, const char *path, const char *permission, DBusError *error);
+int selinux_access_check(sd_bus *bus, sd_bus_message *message, const char *path, const char *permission, sd_bus_error *error);
#ifdef HAVE_SELINUX
-#define SELINUX_ACCESS_CHECK(connection, message, permission) \
+#define SELINUX_ACCESS_CHECK(bus, message, permission) \
do { \
- DBusError _error; \
+ _cleanup_bus_error_free_ sd_bus_error _error = SD_BUS_ERROR_NULL; \
+ sd_bus_message *_m = (message); \
+ sd_bus *_b = (bus); \
int _r; \
- DBusConnection *_c = (connection); \
- DBusMessage *_m = (message); \
- dbus_error_init(&_error); \
- _r = selinux_access_check(_c, _m, NULL, (permission), &_error); \
+ _r = selinux_access_check(_b, _m, NULL, (permission), &_error); \
if (_r < 0) \
- return bus_send_error_reply(_c, _m, &_error, _r); \
+ return sd_bus_reply_method_errno(_b, _m, _r, &_error); \
} while (false)
-#define SELINUX_UNIT_ACCESS_CHECK(unit, connection, message, permission) \
+#define SELINUX_UNIT_ACCESS_CHECK(unit, bus, message, permission) \
do { \
- DBusError _error; \
- int _r; \
- DBusConnection *_c = (connection); \
- DBusMessage *_m = (message); \
+ _cleanup_bus_error_free_ sd_bus_error _error = SD_BUS_ERROR_NULL; \
+ sd_bus_message *_m = (message); \
+ sd_bus *_b = (bus); \
Unit *_u = (unit); \
- dbus_error_init(&_error); \
- _r = selinux_access_check(_c, _m, _u->source_path ?: _u->fragment_path, (permission), &_error); \
+ int _r; \
+ _r = selinux_access_check(_b, _m, _u->source_path ?: _u->fragment_path, (permission), &_error); \
if (_r < 0) \
- return bus_send_error_reply(_c, _m, &_error, _r); \
+ return sd_bus_reply_method_errno(_b, _m, _r, &_error); \
} while (false)
#else
-#define SELINUX_ACCESS_CHECK(connection, message, permission) do { } while (false)
-#define SELINUX_UNIT_ACCESS_CHECK(unit, connection, message, permission) do { } while (false)
+#define SELINUX_ACCESS_CHECK(bus, message, permission) do { } while (false)
+#define SELINUX_UNIT_ACCESS_CHECK(unit, bus, message, permission) do { } while (false)
#endif