morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

loginctl: list-users: use bus_map_all_properties

Browse Source
This commit is contained in:
Mike Yuan
2023-05-23 18:27:05 +08:00
parent be88af3d96
commit 8b0da9971a
1 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/login/loginctl.c
View File

@@ -255,6 +255,13 @@ static int list_sessions(int argc, char *argv[], void *userdata) {
}
static int list_users(int argc, char *argv[], void *userdata) {
static const struct bus_properties_map property_map[] = {
{ "Linger", "b", NULL, offsetof(UserStatusInfo, linger) },
{ "State", "s", NULL, offsetof(UserStatusInfo, state) },
{},
};
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
_cleanup_(table_unrefp) Table *table = NULL;
@@ -281,10 +288,10 @@ static int list_users(int argc, char *argv[], void *userdata) {
for (;;) {
_cleanup_(sd_bus_error_free) sd_bus_error error_property = SD_BUS_ERROR_NULL;
_cleanup_free_ char *state = NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply_property = NULL;
_cleanup_(user_status_info_done) UserStatusInfo info = {};
const char *user, *object;
uint32_t uid;
int linger;
r = sd_bus_message_read(reply, "(uso)", &uid, &user, &object);
if (r < 0)
@@ -292,44 +299,27 @@ static int list_users(int argc, char *argv[], void *userdata) {
if (r == 0)
break;
r = sd_bus_get_property_trivial(bus,
"org.freedesktop.login1",
object,
"org.freedesktop.login1.User",
"Linger",
&error_property,
'b',
&linger);
r = bus_map_all_properties(bus,
"org.freedesktop.login1",
object,
property_map,
BUS_MAP_BOOLEAN_AS_BOOL,
&error_property,
&reply_property,
&info);
if (r < 0) {
if (sd_bus_error_has_name(&error_property, SD_BUS_ERROR_UNKNOWN_OBJECT))
/* The user logged out when we're querying the property */
continue;
return log_error_errno(r, "Failed to get linger status for user %s: %s",
user, bus_error_message(&error_property, r));
}
r = sd_bus_get_property_string(bus,
"org.freedesktop.login1",
object,
"org.freedesktop.login1.User",
"State",
&error_property,
&state);
if (r < 0) {
if (sd_bus_error_has_name(&error_property, SD_BUS_ERROR_UNKNOWN_OBJECT))
/* The user logged out when we're querying the property */
continue;
return log_error_errno(r, "Failed to get state for user %s: %s",
user, bus_error_message(&error_property, r));
log_full_errno(sd_bus_error_has_name(&error_property, SD_BUS_ERROR_UNKNOWN_OBJECT) ? LOG_DEBUG : LOG_WARNING,
r,
"Failed to get properties of user %s, ignoring: %s",
user, bus_error_message(&error_property, r));
continue;
}
r = table_add_many(table,
TABLE_UID, (uid_t) uid,
TABLE_STRING, user,
TABLE_BOOLEAN, linger,
TABLE_STRING, state);
TABLE_BOOLEAN, info.linger,
TABLE_STRING, info.state);
if (r < 0)
return table_log_add_error(r);
}