diff options
author | Lennart Poettering <lennart@poettering.net> | 2015-10-25 23:20:05 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-10-26 01:24:38 +0100 |
commit | d02608170e599b1ffbc7c9a22062bae2579d6e36 (patch) | |
tree | 607136c4d409d664388def7b934bedc23604f4d0 /src/login | |
parent | b1d5277372a26e5a5b9980174652e1e287ba6b14 (diff) |
util: remove lookup_uid(), replace by uid_to_name()
So far we had two pretty much identical calls in user-util.[ch]:
lookup_uid() and uid_to_name(). Get rid of the former, in favour of the
latter, and while we are at it, rewrite it, to use getpwuid_r()
correctly, inside an allocation loop, as POSIX intended.
Diffstat (limited to 'src/login')
-rw-r--r-- | src/login/logind-dbus.c | 2 | ||||
-rw-r--r-- | src/login/logind-utmp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 6da1398b7d..61c2c9ba40 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2028,7 +2028,7 @@ static int method_cancel_scheduled_shutdown(sd_bus_message *message, void *userd } utmp_wall("The system shutdown has been cancelled", - lookup_uid(uid), tty, logind_wall_tty_filter, m); + uid_to_name(uid), tty, logind_wall_tty_filter, m); } return sd_bus_reply_method_return(message, "b", cancelled); diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c index 80e461f2dc..9c766bcb25 100644 --- a/src/login/logind-utmp.c +++ b/src/login/logind-utmp.c @@ -96,7 +96,7 @@ static int warn_wall(Manager *m, usec_t n) { return 0; } - utmp_wall(l, lookup_uid(m->scheduled_shutdown_uid), + utmp_wall(l, uid_to_name(m->scheduled_shutdown_uid), m->scheduled_shutdown_tty, logind_wall_tty_filter, m); return 1; |