diff options
| author | Havoc Pennington <hp@redhat.com> | 2007-06-09 21:53:20 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2007-06-09 21:53:20 +0000 |
| commit | 23832672266bb4ff23b66247c0cfa1a2ed0cc97b (patch) | |
| tree | 119e37411f14923780de3ca7a759707508f1ec63 /dbus/dbus-userdb.h | |
| parent | b80a8fe6b364543aa4b32a02a5ad913faf97173b (diff) | |
2007-06-09 Havoc Pennington <hp@redhat.com>
* bus/dispatch.c (check_get_connection_unix_process_id): adapt
since sysdeps-unix.h stuff isn't included anymore
* bus/bus.c (bus_context_new): use more abstract functions to
change user, so they can be no-ops on Windows
* dbus/dbus-credentials.c, dbus/dbus-credentials.h,
dbus/dbus-credentials-util.c: new files containing a fully opaque
DBusCredentials data type to replace the old not opaque one.
* configure.in (DBUS_UNIX): define DBUS_UNIX to match DBUS_WIN on
windows
* dbus/dbus-userdb.h: prohibit on Windows, next step is to clean
up the uses of it in bus/*.c and factor out the parts of
cookie auth that depend on it
Diffstat (limited to 'dbus/dbus-userdb.h')
| -rw-r--r-- | dbus/dbus-userdb.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/dbus/dbus-userdb.h b/dbus/dbus-userdb.h index 9e278544..4fae6f02 100644 --- a/dbus/dbus-userdb.h +++ b/dbus/dbus-userdb.h @@ -24,7 +24,11 @@ #ifndef DBUS_USERDB_H #define DBUS_USERDB_H -#include <dbus/dbus-sysdeps.h> +#include <dbus/dbus-sysdeps-unix.h> + +#ifdef DBUS_WIN +#error "Don't include this on Windows" +#endif DBUS_BEGIN_DECLS @@ -86,16 +90,13 @@ void _dbus_user_database_lock_system (void); void _dbus_user_database_unlock_system (void); void _dbus_user_database_flush_system (void); -dbus_bool_t _dbus_username_from_current_process (const DBusString **username); -dbus_bool_t _dbus_homedir_from_current_process (const DBusString **homedir); -dbus_bool_t _dbus_homedir_from_username (const DBusString *username, - DBusString *homedir); dbus_bool_t _dbus_get_user_id (const DBusString *username, dbus_uid_t *uid); dbus_bool_t _dbus_get_group_id (const DBusString *group_name, dbus_gid_t *gid); -dbus_bool_t _dbus_credentials_from_username (const DBusString *username, - DBusCredentials *credentials); +dbus_bool_t _dbus_get_user_id_and_primary_group (const DBusString *username, + dbus_uid_t *uid_p, + dbus_gid_t *gid_p); dbus_bool_t _dbus_credentials_from_uid (dbus_uid_t user_id, DBusCredentials *credentials); dbus_bool_t _dbus_groups_from_uid (dbus_uid_t uid, |