summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am7
-rw-r--r--src/basic/user-util.c102
-rw-r--r--src/basic/user-util.h1
-rw-r--r--src/login/logind-dbus.c2
-rw-r--r--src/login/logind-utmp.c2
-rw-r--r--src/test/test-user-util.c53
7 files changed, 122 insertions, 46 deletions
diff --git a/.gitignore b/.gitignore
index b47bd1b2f2..0a32bae7a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -266,6 +266,7 @@
/test-unaligned
/test-unit-file
/test-unit-name
+/test-user-util
/test-utf8
/test-util
/test-verbs
diff --git a/Makefile.am b/Makefile.am
index 69a2b732d0..6540402da9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1414,6 +1414,7 @@ tests += \
test-utf8 \
test-ellipsize \
test-util \
+ test-user-util \
test-hostname-util \
test-process-util \
test-terminal-util \
@@ -1698,6 +1699,12 @@ test_util_SOURCES = \
test_util_LDADD = \
libshared.la
+test_user_util_SOURCES = \
+ src/test/test-user-util.c
+
+test_user_util_LDADD = \
+ libshared.la
+
test_hostname_util_SOURCES = \
src/test/test-hostname-util.c
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index ebeac99d31..b5e6ce8a8a 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -64,33 +64,6 @@ int parse_uid(const char *s, uid_t *ret) {
return 0;
}
-char *lookup_uid(uid_t uid) {
- long bufsize;
- char *name;
- _cleanup_free_ char *buf = NULL;
- struct passwd pwbuf, *pw = NULL;
-
- /* Shortcut things to avoid NSS lookups */
- if (uid == 0)
- return strdup("root");
-
- bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
- if (bufsize <= 0)
- bufsize = 4096;
-
- buf = malloc(bufsize);
- if (!buf)
- return NULL;
-
- if (getpwuid_r(uid, &pwbuf, buf, bufsize, &pw) == 0 && pw)
- return strdup(pw->pw_name);
-
- if (asprintf(&name, UID_FMT, uid) < 0)
- return NULL;
-
- return name;
-}
-
char* getlogname_malloc(void) {
uid_t uid;
struct stat st;
@@ -100,7 +73,7 @@ char* getlogname_malloc(void) {
else
uid = getuid();
- return lookup_uid(uid);
+ return uid_to_name(uid);
}
char *getusername_malloc(void) {
@@ -110,7 +83,7 @@ char *getusername_malloc(void) {
if (e)
return strdup(e);
- return lookup_uid(getuid());
+ return uid_to_name(getuid());
}
int get_user_creds(
@@ -219,37 +192,80 @@ int get_group_creds(const char **groupname, gid_t *gid) {
}
char* uid_to_name(uid_t uid) {
- struct passwd *p;
- char *r;
+ char *ret;
+ int r;
+ /* Shortcut things to avoid NSS lookups */
if (uid == 0)
return strdup("root");
- p = getpwuid(uid);
- if (p)
- return strdup(p->pw_name);
+ if (uid_is_valid(uid)) {
+ long bufsize;
+
+ bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
+ if (bufsize <= 0)
+ bufsize = 4096;
+
+ for (;;) {
+ struct passwd pwbuf, *pw = NULL;
+ _cleanup_free_ char *buf = NULL;
+
+ buf = malloc(bufsize);
+ if (!buf)
+ return NULL;
+
+ r = getpwuid_r(uid, &pwbuf, buf, (size_t) bufsize, &pw);
+ if (r == 0 && pw)
+ return strdup(pw->pw_name);
+ if (r != ERANGE)
+ break;
+
+ bufsize *= 2;
+ }
+ }
- if (asprintf(&r, UID_FMT, uid) < 0)
+ if (asprintf(&ret, UID_FMT, uid) < 0)
return NULL;
- return r;
+ return ret;
}
char* gid_to_name(gid_t gid) {
- struct group *p;
- char *r;
+ char *ret;
+ int r;
if (gid == 0)
return strdup("root");
- p = getgrgid(gid);
- if (p)
- return strdup(p->gr_name);
+ if (gid_is_valid(gid)) {
+ long bufsize;
+
+ bufsize = sysconf(_SC_GETGR_R_SIZE_MAX);
+ if (bufsize <= 0)
+ bufsize = 4096;
+
+ for (;;) {
+ struct group grbuf, *gr = NULL;
+ _cleanup_free_ char *buf = NULL;
+
+ buf = malloc(bufsize);
+ if (!buf)
+ return NULL;
+
+ r = getgrgid_r(gid, &grbuf, buf, (size_t) bufsize, &gr);
+ if (r == 0 && gr)
+ return strdup(gr->gr_name);
+ if (r != ERANGE)
+ break;
+
+ bufsize *= 2;
+ }
+ }
- if (asprintf(&r, GID_FMT, gid) < 0)
+ if (asprintf(&ret, GID_FMT, gid) < 0)
return NULL;
- return r;
+ return ret;
}
int in_gid(gid_t gid) {
diff --git a/src/basic/user-util.h b/src/basic/user-util.h
index 9263ede741..7995698f27 100644
--- a/src/basic/user-util.h
+++ b/src/basic/user-util.h
@@ -36,7 +36,6 @@ static inline int parse_gid(const char *s, gid_t *ret_gid) {
return parse_uid(s, (uid_t*) ret_gid);
}
-char* lookup_uid(uid_t uid);
char* getlogname_malloc(void);
char* getusername_malloc(void);
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;
diff --git a/src/test/test-user-util.c b/src/test/test-user-util.c
new file mode 100644
index 0000000000..dfd2031998
--- /dev/null
+++ b/src/test/test-user-util.c
@@ -0,0 +1,53 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2015 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "macro.h"
+#include "string-util.h"
+#include "user-util.h"
+#include "util.h"
+
+static void test_uid_to_name_one(uid_t uid, const char *name) {
+ _cleanup_free_ char *t = NULL;
+
+ assert_se(t = uid_to_name(uid));
+ assert_se(streq_ptr(t, name));
+}
+
+static void test_gid_to_name_one(gid_t gid, const char *name) {
+ _cleanup_free_ char *t = NULL;
+
+ assert_se(t = gid_to_name(gid));
+ assert_se(streq_ptr(t, name));
+}
+
+int main(int argc, char*argv[]) {
+
+ test_uid_to_name_one(0, "root");
+ test_uid_to_name_one(0xFFFF, "65535");
+ test_uid_to_name_one(0xFFFFFFFF, "4294967295");
+
+ test_gid_to_name_one(0, "root");
+ test_gid_to_name_one(TTY_GID, "tty");
+ test_gid_to_name_one(0xFFFF, "65535");
+ test_gid_to_name_one(0xFFFFFFFF, "4294967295");
+
+ return 0;
+}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-10 11:08:14 +0000