Print this page
2989 Eliminate use of LOGNAME_MAX in ON
1166 useradd have warning with name more 8 chars

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/oamuser/lib/vlogin.c
          +++ new/usr/src/cmd/oamuser/lib/vlogin.c
↓ open down ↓ 12 lines elided ↑ open up ↑
  13   13   *
  14   14   * When distributing Covered Code, include this CDDL HEADER in each
  15   15   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16   * If applicable, add the following below this CDDL HEADER, with the
  17   17   * fields enclosed by brackets "[]" replaced with your own identifying
  18   18   * information: Portions Copyright [yyyy] [name of copyright owner]
  19   19   *
  20   20   * CDDL HEADER END
  21   21   */
  22   22  /*
       23 + * Copyright (c) 2013 Gary Mills
       24 + *
  23   25   * Copyright (c) 1997, by Sun Microsystems, Inc.
  24   26   * All rights reserved.
  25   27   */
  26   28  
  27   29  /*      Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
  28   30  /*        All Rights Reserved   */
  29   31  
  30      -
  31      -#pragma ident   "%Z%%M% %I%     %E% SMI"        /* SVr4.0 1.3 */
  32      -
  33   32  /*LINTLIBRARY*/
  34   33  
  35   34  #include        <sys/types.h>
  36   35  #include        <stdio.h>
  37   36  #include        <ctype.h>
  38   37  #include        <userdefs.h>
  39   38  #include        <users.h>
  40   39  #include        <limits.h>
  41   40  
  42   41  /*
↓ open down ↓ 18 lines elided ↑ open up ↑
  61   60          for (; c != NULL; ptr++, c = *ptr) {
  62   61                  len++;
  63   62                  if (!isprint(c) || (c == ':') || (c == '\n'))
  64   63                          return (INVALID);
  65   64                  if (!isalnum(c) && c != '_' && c != '-' && c != '.')
  66   65                          badc++;
  67   66                  if (islower(c))
  68   67                          clower++;
  69   68          }
  70   69  
  71      -        /*
  72      -         * XXX length checking causes some operational/compatibility problem.
  73      -         * This has to be revisited in the future as ARC/standards issue.
  74      -         */
  75      -        if (len > LOGNAME_MAX)
  76      -                *warning = *warning | WARN_NAME_TOO_LONG;
       70 +        if (len > LOGNAME_MAX_ILLUMOS)
       71 +                return (LONGNAME);
       72 +
  77   73          if (clower == 0)
  78   74                  *warning = *warning | WARN_NO_LOWERCHAR;
  79   75          if (badc != 0)
  80   76                  *warning = *warning | WARN_BAD_LOGNAME_CHAR;
  81   77          if (bad1char != 0)
  82   78                  *warning = *warning | WARN_BAD_LOGNAME_FIRST;
  83   79  
  84   80          if ((t_pptr = getpwnam(login)) != NULL) {
  85   81                  if (pptr) *pptr = t_pptr;
  86   82                  return (NOTUNIQUE);
  87   83          }
  88   84          return (UNIQUE);
  89   85  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX