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
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License, Version 1.0 only
6 6 * (the "License"). You may not use this file except in compliance
7 7 * with the License.
8 8 *
9 9 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
10 10 * or http://www.opensolaris.org/os/licensing.
11 11 * See the License for the specific language governing permissions
12 12 * and limitations under the License.
|
↓ 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>
39 +#include <deflt.h>
40 40 #include <limits.h>
41 41
42 +/* Defaults file */
43 +#define DEFAULT_USERADD "/etc/default/useradd"
44 +
42 45 /*
43 46 * validate string given as login name.
44 47 */
45 48 int
46 49 valid_login(char *login, struct passwd **pptr, int *warning)
47 50 {
48 51 struct passwd *t_pptr;
49 52 char *ptr = login;
50 53 int bad1char, badc, clower, len;
51 54 char c;
55 + char action;
52 56
53 57 len = 0; clower = 0; badc = 0; bad1char = 0;
54 58 *warning = 0;
55 59 if (!login || !*login)
56 60 return (INVALID);
57 61
58 62 c = *ptr;
59 63 if (!isalpha(c))
60 64 bad1char++;
61 65 for (; c != NULL; ptr++, c = *ptr) {
62 66 len++;
63 67 if (!isprint(c) || (c == ':') || (c == '\n'))
64 68 return (INVALID);
65 69 if (!isalnum(c) && c != '_' && c != '-' && c != '.')
66 70 badc++;
67 71 if (islower(c))
68 72 clower++;
69 73 }
70 74
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 + action = 'w';
76 + if (defopen(DEFAULT_USERADD) == 0) {
77 + char *defptr;
78 +
79 + if ((defptr = defread("EXCEED_TRAD=")) != NULL) {
80 + char let = tolower(*defptr);
81 +
82 + switch (let) {
83 + case 'w': /* warning */
84 + case 'e': /* error */
85 + case 's': /* silent */
86 + action = let;
87 + break;
88 + }
89 + }
90 + (void) defopen((char *)NULL);
91 + }
92 +
75 93 if (len > LOGNAME_MAX)
76 - *warning = *warning | WARN_NAME_TOO_LONG;
94 + return (LONGNAME);
95 +
96 + if (len > LOGNAME_MAX_TRAD) {
97 + if (action == 'w')
98 + *warning = *warning | WARN_NAME_TOO_LONG;
99 + else if (action == 'e')
100 + return (LONGNAME);
101 + }
102 +
77 103 if (clower == 0)
78 104 *warning = *warning | WARN_NO_LOWERCHAR;
79 105 if (badc != 0)
80 106 *warning = *warning | WARN_BAD_LOGNAME_CHAR;
81 107 if (bad1char != 0)
82 108 *warning = *warning | WARN_BAD_LOGNAME_FIRST;
83 109
84 110 if ((t_pptr = getpwnam(login)) != NULL) {
85 111 if (pptr) *pptr = t_pptr;
86 112 return (NOTUNIQUE);
87 113 }
88 114 return (UNIQUE);
89 115 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX