[BACK]Return to getgrouplist.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / sudo / compat

Diff for /embedaddon/sudo/compat/getgrouplist.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2013/07/22 10:46:11 version 1.1.1.3, 2013/10/14 07:56:33
Line 92  done: Line 92  done:
   
 #elif defined(HAVE_NSS_SEARCH)  #elif defined(HAVE_NSS_SEARCH)
   
 #ifndef GID_MAX  
 # define GID_MAX        UID_MAX  
 #endif  
   
 #ifndef ALIGNBYTES  #ifndef ALIGNBYTES
 # define ALIGNBYTES     (sizeof(long) - 1L)  # define ALIGNBYTES     (sizeof(long) - 1L)
 #endif  #endif
Line 105  done: Line 101  done:
   
 extern void _nss_initf_group(nss_db_params_t *);  extern void _nss_initf_group(nss_db_params_t *);
   
   static id_t
   strtoid(const char *p, int *errval)
   {
       char *ep;
       id_t rval = 0;
   
       errno = 0;
       if (*p == '-') {
           long lval = strtol(p, &ep, 10);
           if (ep == p || *ep != '\0') {
               *errval = EINVAL;
               goto done;
           }
           if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) ||
               (lval > INT_MAX || lval < INT_MIN)) {
               *errval = ERANGE;
               goto done;
           }
           rval = (id_t)lval;
           *errval = 0;
       } else {
           unsigned long ulval = strtoul(p, &ep, 10);
           if (ep == p || *ep != '\0') {
               *errval = EINVAL;
               goto done;
           }
           if ((errno == ERANGE && ulval == ULONG_MAX) || ulval > UINT_MAX) {
               *errval = ERANGE;
               goto done;
           }
           rval = (id_t)ulval;
           *errval = 0;
       }
   done:
       return rval;
   }
   
 /*  /*
  * Convert a groups file string (instr) to a struct group (ent) using   * Convert a groups file string (instr) to a struct group (ent) using
  * buf for storage.     * buf for storage.  
Line 113  static int Line 146  static int
 str2grp(const char *instr, int inlen, void *ent, char *buf, int buflen)  str2grp(const char *instr, int inlen, void *ent, char *buf, int buflen)
 {  {
     struct group *grp = ent;      struct group *grp = ent;
    char *cp, *ep, *fieldsep = buf;    char *cp, *fieldsep = buf;
     char **gr_mem, **gr_end;      char **gr_mem, **gr_end;
    int yp = 0;    int errval, yp = 0;
    unsigned long gid;    id_t id;
   
     /* Must at least have space to copy instr -> buf. */      /* Must at least have space to copy instr -> buf. */
     if (inlen >= buflen)      if (inlen >= buflen)
Line 150  str2grp(const char *instr, int inlen, void *ent, char  Line 183  str2grp(const char *instr, int inlen, void *ent, char 
     if ((fieldsep = strchr(cp = fieldsep, ':')) == NULL)      if ((fieldsep = strchr(cp = fieldsep, ':')) == NULL)
         return yp ? NSS_STR_PARSE_SUCCESS : NSS_STR_PARSE_PARSE;          return yp ? NSS_STR_PARSE_SUCCESS : NSS_STR_PARSE_PARSE;
     *fieldsep++ = '\0';      *fieldsep++ = '\0';
    gid = strtoul(cp, &ep, 10);    id = strtoid(cp, &errval);
    if (*cp == '\0' || *ep != '\0')    if (errval != 0) {
         /*
          * A range error is always a fatal error, but ignore garbage
          * at the end of YP entries since it has no meaning.
          */
         if (errval == ERANGE)
             return NSS_STR_PARSE_ERANGE;
         return yp ? NSS_STR_PARSE_SUCCESS : NSS_STR_PARSE_PARSE;          return yp ? NSS_STR_PARSE_SUCCESS : NSS_STR_PARSE_PARSE;
       }
 #ifdef GID_NOBODY  #ifdef GID_NOBODY
    if (*cp == '-' && gid != 0) {    /* Negative gids get mapped to nobody on Solaris. */
        /* Negative gids get mapped to nobody on Solaris. */    if (*cp == '-' && id != 0)
         grp->gr_gid = GID_NOBODY;          grp->gr_gid = GID_NOBODY;
    } else    else
 #endif  #endif
    if ((errno == ERANGE && gid == ULONG_MAX) ||        grp->gr_gid = (gid_t)id;
        gid > GID_MAX || gid != (gid_t)gid) { 
        return NSS_STR_PARSE_ERANGE; 
    } else { 
        grp->gr_gid = (gid_t)gid; 
    } 
   
     /* Store group members, taking care to use proper alignment. */      /* Store group members, taking care to use proper alignment. */
     grp->gr_mem = NULL;      grp->gr_mem = NULL;
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>