From ee1c062be09da006e82ab34c1c9b5c82dd2af92c Mon Sep 17 00:00:00 2001

From: Florian Weimer <fweimer@redhat.com>

Date: Thu, 16 Jul 2020 17:34:19 +0200

Subject: [PATCH 09/11] pwd: Implement fgetpwent_r using __nss_fgetent_r

Tested-by: Carlos O'Donell <carlos@redhat.com>

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

---

 pwd/fgetpwent_r.c | 43 ++++++-------------------------------------

 1 file changed, 6 insertions(+), 37 deletions(-)

diff -rup a/pwd/fgetpwent_r.c b/pwd/fgetpwent_r.c

--- a/pwd/fgetpwent_r.c	2018-08-01 01:10:47.000000000 -0400

+++ b/pwd/fgetpwent_r.c	2020-09-14 19:03:41.277514743 -0400

@@ -20,9 +20,6 @@

 #include <stdio.h>

 #include <pwd.h>

-#define flockfile(s) _IO_flockfile (s)

-#define funlockfile(s) _IO_funlockfile (s)

-

 /* Define a line parsing function using the common code

    used in the nss_files module.  */

@@ -72,39 +69,11 @@ int

 __fgetpwent_r (FILE *stream, struct passwd *resbuf, char *buffer,

 	       size_t buflen, struct passwd **result)

 {

-  char *p;

-

-  flockfile (stream);

-  do

-    {

-      buffer[buflen - 1] = '\xff';

-      p = fgets_unlocked (buffer, buflen, stream);

-      if (p == NULL && feof_unlocked (stream))

-	{

-	  funlockfile (stream);

-	  *result = NULL;

-	  __set_errno (ENOENT);

-	  return errno;

-	}

-      if (p == NULL || buffer[buflen - 1] != '\xff')

-	{

-	  funlockfile (stream);

-	  *result = NULL;

-	  __set_errno (ERANGE);

-	  return errno;

-	}

-

-      /* Skip leading blanks.  */

-      while (isspace (*p))

-	++p;

-    } while (*p == '\0' || *p == '#' ||	/* Ignore empty and comment lines.  */

-	     /* Parse the line.  If it is invalid, loop to

-		get the next line of the file to parse.  */

-	     ! parse_line (p, resbuf, (void *) buffer, buflen, &errno));

-

-  funlockfile (stream);

-

-  *result = resbuf;

-  return 0;

+  int ret = __nss_fgetent_r (stream, resbuf, buffer, buflen, parse_line);

+  if (ret == 0)

+    *result = resbuf;

+  else

+    *result = NULL;

+  return ret;

 }

 weak_alias (__fgetpwent_r, fgetpwent_r)