From 612e400c68e644054e476082cb757b0a157a564b Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sat, 16 Jan 2010 13:53:52 +1100 Subject: - (dtucker) [openbsd-compat/pwcache.c] Shrink ifdef area to prevent unused variable warnings. --- openbsd-compat/pwcache.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'openbsd-compat/pwcache.c') diff --git a/openbsd-compat/pwcache.c b/openbsd-compat/pwcache.c index fa60935d0..5a8b78801 100644 --- a/openbsd-compat/pwcache.c +++ b/openbsd-compat/pwcache.c @@ -58,12 +58,12 @@ user_from_uid(uid_t uid, int nouser) cp = c_uid + (uid & MASK); if (cp->uid != uid || cp->name == NULL) { -#ifdef HAVE_SETPASSENT if (pwopen == 0) { +#ifdef HAVE_SETPASSENT setpassent(1); +#endif pwopen = 1; } -#endif if ((pw = getpwuid(uid)) == NULL) { if (nouser) return (NULL); @@ -93,12 +93,12 @@ group_from_gid(gid_t gid, int nogroup) cp = c_gid + (gid & MASK); if (cp->gid != gid || cp->name == NULL) { -#ifdef HAVE_SETGROUPENT if (gropen == 0) { +#ifdef HAVE_SETGROUPENT setgroupent(1); +#endif gropen = 1; } -#endif if ((gr = getgrgid(gid)) == NULL) { if (nogroup) return (NULL); -- cgit v1.2.3