From db702f87b098c449905c03610b4111e06116f9a1 Mon Sep 17 00:00:00 2001 From: Ian Lepore Date: Fri, 27 Jul 2018 15:17:24 +0000 Subject: Remove some code that's no longer needed because it's now part of pw_scan(3). It was also leading to segfaults; pw can be NULL when control reaches these lines now, because of the way my previous change restructured the loops. Reported by: lwhsu@ --- pw/pw_vpw.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pw/pw_vpw.c b/pw/pw_vpw.c index 4517a74..192d588 100644 --- a/pw/pw_vpw.c +++ b/pw/pw_vpw.c @@ -113,18 +113,6 @@ vnextpwent(char const *nam, uid_t uid, int doclose) } free(line); - /* - * If we read the non-master passwd, some fields may not have been - * populated. Clean them up so that the output looks the same as that - * generated using getpwnam() which also inits them to these values. - */ - if (!(pw->pw_fields & _PWF_CLASS)) - pw->pw_class = ""; - if (!(pw->pw_fields & _PWF_CHANGE)) - pw->pw_change = 0; - if (!(pw->pw_fields & _PWF_EXPIRE)) - pw->pw_expire = 0; - return (pw); } -- cgit v1.2.3-56-ge451