src/patches/glibc/glibc-rh1087833.patch

   1 commit c3ec475c5dd16499aa040908e11d382c3ded9692
   2 Author: Siddhesh Poyarekar <siddhesh@redhat.com>
   3 Date:   Mon May 26 11:40:08 2014 +0530
   4
   5     Use NSS_STATUS_TRYAGAIN to indicate insufficient buffer (BZ #16878)
   6
   7     The netgroups nss modules in the glibc tree use NSS_STATUS_UNAVAIL
   8     (with errno as ERANGE) when the supplied buffer does not have
   9     sufficient space for the result.  This is wrong, because the canonical
  10     way to indicate insufficient buffer is to set the errno to ERANGE and
  11     the status to NSS_STATUS_TRYAGAIN, as is used by all other modules.
  12
  13     This fixes nscd behaviour when the nss_ldap module returns
  14     NSS_STATUS_TRYAGAIN to indicate that a netgroup entry is too long to
  15     fit into the supplied buffer.
  16
  17 diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c
  18 index b3d40e9..edab174 100644
  19 --- a/nscd/netgroupcache.c
  20 +++ b/nscd/netgroupcache.c
  21 @@ -197,11 +197,6 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
  22                     int e;
  23                     status = getfct.f (&data, buffer + buffilled,
  24                                        buflen - buffilled - req->key_len, &e);
  25 -                   if (status == NSS_STATUS_RETURN
  26 -                       || status == NSS_STATUS_NOTFOUND)
  27 -                     /* This was either the last one for this group or the
  28 -                        group was empty.  Look at next group if available.  */
  29 -                     break;
  30                     if (status == NSS_STATUS_SUCCESS)
  31                       {
  32                         if (data.type == triple_val)
  33 @@ -320,11 +315,18 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
  34                               }
  35                           }
  36                       }
  37 -                   else if (status == NSS_STATUS_UNAVAIL && e == ERANGE)
  38 +                   else if (status == NSS_STATUS_TRYAGAIN && e == ERANGE)
  39                       {
  40                         buflen *= 2;
  41                         buffer = xrealloc (buffer, buflen);
  42                       }
  43 +                   else if (status == NSS_STATUS_RETURN
  44 +                            || status == NSS_STATUS_NOTFOUND
  45 +                            || status == NSS_STATUS_UNAVAIL)
  46 +                     /* This was either the last one for this group or the
  47 +                        group was empty or the NSS module had an internal
  48 +                        failure.  Look at next group if available.  */
  49 +                     break;
  50                   }
  51
  52               enum nss_status (*endfct) (struct __netgrent *);
  53 diff --git a/nss/nss_files/files-netgrp.c b/nss/nss_files/files-netgrp.c
  54 index 34eae4c..bc0b367 100644
  55 --- a/nss/nss_files/files-netgrp.c
  56 +++ b/nss/nss_files/files-netgrp.c
  57 @@ -252,7 +252,7 @@ _nss_netgroup_parseline (char **cursor, struct __netgrent *result,
  58    if (cp - host > buflen)
  59      {
  60        *errnop = ERANGE;
  61 -      status = NSS_STATUS_UNAVAIL;
  62 +      status = NSS_STATUS_TRYAGAIN;
  63      }
  64    else
  65      {