diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2010-01-29 23:57:07 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2010-01-29 23:57:07 +0100 |
| commit | 2016b83dece7f220269033e7957fb02140334294 (patch) | |
| tree | 0dbbb9779437534332cf90cb783ee396e716f834 | |
| parent | e77fff6dfaa1f9a0fc1aa8aaf4bd7c97b847d4b3 (diff) | |
_dbus_change_to_daemon_user() is platform related and commit 0a3905d7f3b2ff43b09479863775939f9c8acad4 broke windows builds
| -rw-r--r-- | bus/selinux.c | 5 | ||||
| -rw-r--r-- | bus/selinux.h | 2 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps.h | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/bus/selinux.c b/bus/selinux.c index 456723ac..614fa31b 100644 --- a/bus/selinux.c +++ b/bus/selinux.c @@ -22,7 +22,9 @@ */ #include <dbus/dbus-internals.h> #include <dbus/dbus-string.h> +#ifndef DBUS_WIN #include <dbus/dbus-userdb.h> +#endif #include "selinux.h" #include "services.h" #include "policy.h" @@ -1017,6 +1019,7 @@ bus_selinux_shutdown (void) #endif /* HAVE_SELINUX */ } +#ifndef DBUS_WIN /** * Changes the user and group the bus is running as. * @@ -1118,3 +1121,5 @@ _dbus_change_to_daemon_user (const char *user, return TRUE; } +#endif + diff --git a/bus/selinux.h b/bus/selinux.h index f208fbeb..3bab36de 100644 --- a/bus/selinux.h +++ b/bus/selinux.h @@ -68,7 +68,5 @@ BusSELinuxID* bus_selinux_init_connection_id (DBusConnection *connection, void bus_selinux_audit_init(void); -dbus_bool_t _dbus_change_to_daemon_user (const char *user, - DBusError *error); #endif /* BUS_SELINUX_H */ diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index 75d5cc26..50998f04 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -408,6 +408,8 @@ dbus_bool_t _dbus_become_daemon (const DBusString *pidfile, dbus_bool_t keep_umask); dbus_bool_t _dbus_verify_daemon_user (const char *user); +dbus_bool_t _dbus_change_to_daemon_user (const char *user, + DBusError *error); dbus_bool_t _dbus_write_pid_to_file_and_pipe (const DBusString *pidfile, DBusPipe *print_pid_pipe, |