From cb6a112f09c3b5dfe94b5c365ca50df4dcc05520 Mon Sep 17 00:00:00 2001 From: Tito Ragusa Date: Thu, 19 Feb 2015 22:02:59 +0100 Subject: libpwdgrp: fix thinko in getpwnam function old new delta parse_file - 64 +64 getXXnam_r 162 138 -24 getXXnam 90 50 -40 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/2 up/down: 64/-64) Total: 0 bytes Signed-off-by: Tito Ragusa Signed-off-by: Denys Vlasenko --- libpwdgrp/pwd_grp.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'libpwdgrp/pwd_grp.c') diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c index 7ec704ee4..3886facf0 100644 --- a/libpwdgrp/pwd_grp.c +++ b/libpwdgrp/pwd_grp.c @@ -450,15 +450,7 @@ static void* FAST_FUNC getXXnam(const char *name, unsigned db_and_field_pos) char *buf; struct passdb *db = &get_S()->db[db_and_field_pos >> 2]; - if (!db->fp) { - db->fp = fopen_for_read(db->filename); - if (!db->fp) { - return NULL; - } - close_on_exec_on(fileno(db->fp)); - } - - buf = parse_common(db->fp, db, name, db_and_field_pos & 3); + buf = parse_file(db, name, db_and_field_pos & 3); return massage_data_for_non_r_func(db, buf); } -- cgit v1.2.3