Magellan Linux

Contents of /trunk/shadow/patches/shadow-4.0.18.1-gid.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 153 - (show annotations) (download)
Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
File size: 1014 byte(s)
-import

1 --- shadow-4.0.18.1/src/useradd.c.gid 2006-11-04 14:09:53.000000000 +0100
2 +++ shadow-4.0.18.1/src/useradd.c 2006-11-04 14:15:09.000000000 +0100
3 @@ -207,11 +207,8 @@
4 char *errptr;
5
6 gid = strtol (grname, &errptr, 10);
7 - if (*errptr || errno == ERANGE || gid < 0) {
8 - fprintf (stderr,
9 - _("%s: invalid numeric argument '%s'\n"), Prog, grname);
10 - exit (E_BAD_ARG);
11 - }
12 + if (*grname != '\0' && *errptr == '\0' && errno != ERANGE && gid >= 0)
13 + return getgrgid (gid);
14 return getgrnam (grname);
15 }
16
17 --- shadow-4.0.18.1/src/usermod.c.gid 2006-11-04 14:15:23.000000000 +0100
18 +++ shadow-4.0.18.1/src/usermod.c 2006-11-04 14:16:42.000000000 +0100
19 @@ -166,11 +166,8 @@
20 char *errptr;
21
22 val = strtol (grname, &errptr, 10);
23 - if (*errptr || errno == ERANGE || val < 0) {
24 - fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
25 - grname);
26 - exit (E_BAD_ARG);
27 - }
28 + if (*grname != '\0' && *errptr == '\0' && errno != ERANGE && val >= 0)
29 + return getgrgid (val);
30 return getgrnam (grname);
31 }
32