[v2,17/23] nscd: Convert passwd client to __nscd_generic_get

  ---
 nscd/nscd_getpw_r.c | 165 +++++---------------------------------------
 1 file changed, 19 insertions(+), 146 deletions(-)
  

On 3/20/26 4:42 PM, Florian Weimer wrote:

LGTM.

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

> ---
>   nscd/nscd_getpw_r.c | 165 +++++---------------------------------------
>   1 file changed, 19 insertions(+), 146 deletions(-)
> 
> diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c
> index 8ce1009fe0..97a752fa48 100644
> --- a/nscd/nscd_getpw_r.c
> +++ b/nscd/nscd_getpw_r.c
> @@ -29,23 +29,21 @@
>   #include <sys/un.h>
>   #include <not-cancel.h>
>   #include <_itoa.h>
> +#include <nss/nss_generic.h>
>   
>   #include "nscd-client.h"
>   #include "nscd-dbtype.h"
>   #include "nscd_proto.h"
>   
> -static int nscd_getpw_r (const char *key, size_t keylen, request_type type,
> -			 struct passwd *resultbuf, char *buffer,
> -			 size_t buflen, struct passwd **result);
> +static int nscd_getpw_r (enum nss_lookup_type lt, const void *key,
> +			 struct passwd *resultbuf, char *buffer, size_t buflen,
> +			 struct passwd **result);
>   
>   int
>   __nscd_getpwnam_r (const char *name, struct passwd *resultbuf, char *buffer,
>   		   size_t buflen, struct passwd **result)
>   {
> -  if (name == NULL)
> -    return -1;
> -
> -  return nscd_getpw_r (name, strlen (name) + 1, GETPWBYNAME, resultbuf,
> +  return nscd_getpw_r (nss_lookup_getpwnam, name, resultbuf,
>   		       buffer, buflen, result);
>   }
>   
> @@ -53,155 +51,30 @@ int
>   __nscd_getpwuid_r (uid_t uid, struct passwd *resultbuf, char *buffer,
>   		   size_t buflen, struct passwd **result)
>   {
> -  char buf[3 * sizeof (uid_t)];
> -  buf[sizeof (buf) - 1] = '\0';
> -  char *cp = _itoa_word (uid, buf + sizeof (buf) - 1, 10, 0);
> -
> -  return nscd_getpw_r (cp, buf + sizeof (buf) - cp, GETPWBYUID, resultbuf,
> +  return nscd_getpw_r (nss_lookup_getpwuid, &uid, resultbuf,
>   		       buffer, buflen, result);
>   }
>   
>   
>   static int
> -nscd_getpw_r (const char *key, size_t keylen, request_type type,
> +nscd_getpw_r (enum nss_lookup_type lt, const void *key,
>   	      struct passwd *resultbuf, char *buffer, size_t buflen,
>   	      struct passwd **result)
>   {
> -  int gc_cycle;
> -  int nretries = 0;
> -
> -  /* If the mapping is available, try to search there instead of
> -     communicating with the nscd.  */
> -  struct mapped_database *map = __nscd_get_map_ref (pwddb, &gc_cycle);
> -
> - retry:;
> -  const char *pw_name = NULL;
> -  int retval = -1;
> -  const char *recend = (const char *) ~UINTMAX_C (0);
> -  pw_response_header pw_resp;
> -
> -  if (map != NULL)
> +  void *result1;
> +  bool ok = __nscd_generic_get (lt, key, &result1);
> +  if (ok)
>       {
> -      struct datahead *found = __nscd_cache_search (type, key, keylen, map,
> -						    sizeof pw_resp);
> -      if (found != NULL)
> +      if (result1 == NULL)
>   	{
> -	  pw_name = (const char *) (&found->data[0].pwdata + 1);
> -	  pw_resp = found->data[0].pwdata;
> -	  recend = (const char *) found->data + found->recsize;
> -	  /* Now check if we can trust pw_resp fields.  If GC is
> -	     in progress, it can contain anything.  */
> -	  if (map->head->gc_cycle != gc_cycle)
> -	    {
> -	      retval = -2;
> -	      goto out;
> -	    }
> +	  *result = NULL;
> +	  return 0;
>   	}
> +      int ret = __nss_generic_copy (lt, result1, resultbuf, buffer, buflen);
> +      free (result1);
> +      if (ret == 0)
> +	*result = resultbuf;
> +      return ret;
>       }
> -
> -  int sock = -1;
> -  if (pw_name == NULL)
> -    {
> -      sock = __nscd_open_socket (key, keylen, type, &pw_resp,
> -				 sizeof (pw_resp));
> -      if (sock == -1)
> -	{
> -	  __nscd_defer_database (pwddb);
> -	  goto out;
> -	}
> -    }
> -
> -  /* No value found so far.  */
> -  *result = NULL;
> -
> -  if (__glibc_unlikely (pw_resp.found == -1))
> -    {
> -      /* The daemon does not cache this database.  */
> -      __nscd_defer_database (pwddb);
> -      goto out_close;
> -    }
> -
> -  if (pw_resp.found == 1)
> -    {
> -      /* Set the information we already have.  */
> -      resultbuf->pw_uid = pw_resp.pw_uid;
> -      resultbuf->pw_gid = pw_resp.pw_gid;
> -
> -      char *p = buffer;
> -      /* get pw_name */
> -      resultbuf->pw_name = p;
> -      p += pw_resp.pw_name_len;
> -      /* get pw_passwd */
> -      resultbuf->pw_passwd = p;
> -      p += pw_resp.pw_passwd_len;
> -      /* get pw_gecos */
> -      resultbuf->pw_gecos = p;
> -      p += pw_resp.pw_gecos_len;
> -      /* get pw_dir */
> -      resultbuf->pw_dir = p;
> -      p += pw_resp.pw_dir_len;
> -      /* get pw_pshell */
> -      resultbuf->pw_shell = p;
> -      p += pw_resp.pw_shell_len;
> -
> -      ssize_t total = p - buffer;
> -      if (__glibc_unlikely (pw_name + total > recend))
> -	goto out_close;
> -      if (__glibc_unlikely (buflen < total))
> -	{
> -	  __set_errno (ERANGE);
> -	  retval = ERANGE;
> -	  goto out_close;
> -	}
> -
> -      retval = 0;
> -      if (pw_name == NULL)
> -	{
> -	  ssize_t nbytes = __readall (sock, buffer, total);
> -
> -	  if (__glibc_unlikely (nbytes != total))
> -	    {
> -	      /* The `errno' to some value != ERANGE.  */
> -	      __set_errno (ENOENT);
> -	      retval = ENOENT;
> -	    }
> -	  else
> -	    *result = resultbuf;
> -	}
> -      else
> -	{
> -	  /* Copy the various strings.  */
> -	  memcpy (resultbuf->pw_name, pw_name, total);
> -
> -	  /* Try to detect corrupt databases.  */
> -	  if (resultbuf->pw_name[pw_resp.pw_name_len - 1] != '\0'
> -	      || resultbuf->pw_passwd[pw_resp.pw_passwd_len - 1] != '\0'
> -	      || resultbuf->pw_gecos[pw_resp.pw_gecos_len - 1] != '\0'
> -	      || resultbuf->pw_dir[pw_resp.pw_dir_len - 1] != '\0'
> -	      || resultbuf->pw_shell[pw_resp.pw_shell_len - 1] != '\0')
> -	    {
> -	      /* We cannot use the database.  */
> -	      retval = map->head->gc_cycle != gc_cycle ? -2 : -1;
> -	      goto out_close;
> -	    }
> -
> -	  *result = resultbuf;
> -	}
> -    }
> -  else
> -    {
> -      /* Set errno to 0 to indicate no error, just no found record.  */
> -      __set_errno (0);
> -      /* Even though we have not found anything, the result is zero.  */
> -      retval = 0;
> -    }
> -
> - out_close:
> -  if (sock != -1)
> -    __close_nocancel_nostatus (sock);
> - out:
> -  if (__nscd_map_ref_retry_or_drop (&map, &gc_cycle, &nretries, retval))
> -    goto retry;
> -
> -  return retval;
> +  return -1;

  59 static int
  60 nscd_getpw_r (enum nss_lookup_type lt, const void *key,
  61               struct passwd *resultbuf, char *buffer, size_t buflen,
  62               struct passwd **result)
  63 {
  64   void *result1;
  65   bool ok = __nscd_generic_get (lt, key, &result1);
  66   if (ok)
  67     {
  68       if (result1 == NULL)
  69         {
  70           *result = NULL;
  71           return 0;
  72         }
  73       int ret = __nss_generic_copy (lt, result1, resultbuf, buffer, buflen);
  74       free (result1);
  75       if (ret == 0)
  76         *result = resultbuf;
  77       return ret;
  78     }
  79   return -1;
  80 }

OK.


>   }