From f030d36cd0a48856b6970541bd5baf74c2c06449 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 26 Nov 2018 04:41:53 +0900 Subject: [PATCH] sysusers: use fgetgrent_sane() --- src/sysusers/sysusers.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c index c2326ee9b8..3eb70f5e8f 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -140,8 +140,7 @@ static int load_group_database(void) { if (r < 0) return r; - errno = 0; - while ((gr = fgetgrent(f))) { + while ((r = fgetgrent_sane(f, &gr)) > 0) { char *n; int k, q; @@ -164,13 +163,8 @@ static int load_group_database(void) { if (k <= 0 && q <= 0) free(n); - - errno = 0; } - if (!IN_SET(errno, 0, ENOENT)) - return -errno; - - return 0; + return r; } static int make_backup(const char *target, const char *x) {