diff options
Diffstat (limited to 'dbus/dbus-userdb-util.c')
| -rw-r--r-- | dbus/dbus-userdb-util.c | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c index 1ca21eb7..0eadc78a 100644 --- a/dbus/dbus-userdb-util.c +++ b/dbus/dbus-userdb-util.c @@ -65,11 +65,6 @@ dbus_bool_t _dbus_is_console_user (dbus_uid_t uid, DBusError *error) { - - DBusUserDatabase *db; - const DBusUserInfo *info; - dbus_bool_t result = FALSE; - #ifdef HAVE_SYSTEMD /* check if we have logind */ if (access ("/run/systemd/seats/", F_OK) >= 0) @@ -120,35 +115,7 @@ _dbus_is_console_user (dbus_uid_t uid, #endif /* HAVE_CONSOLE_OWNER_FILE */ - if (!_dbus_user_database_lock_system ()) - { - _DBUS_SET_OOM (error); - return FALSE; - } - - db = _dbus_user_database_get_system (); - if (db == NULL) - { - dbus_set_error (error, DBUS_ERROR_FAILED, "Could not get system database."); - _dbus_user_database_unlock_system (); - return FALSE; - } - - /* TPTD: this should be cache-safe, we've locked the DB and - _dbus_user_at_console doesn't pass it on. */ - info = _dbus_user_database_lookup (db, uid, NULL, error); - - if (info == NULL) - { - _dbus_user_database_unlock_system (); - return FALSE; - } - - result = _dbus_user_at_console (info->username, error); - - _dbus_user_database_unlock_system (); - - return result; + return FALSE; } /** |