Changeset 65850c02 for patches/shadow-4.0.18.2-useradd_fix-2.patch

Timestamp:

Oct 30, 2007, 2:40:23 AM (17 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

fb30cde

Parents:

c2a35a3

Message:

Updated shadow patch. Better Patch

File:

• patches/shadow-4.0.18.2-useradd_fix-2.patch (moved) (moved from patches/shadow-4.0.18.2-useradd_fix-1.patch ) (4 diffs)

patches/shadow-4.0.18.2-useradd_fix-2.patch

@@ -8 +8 @@
 diff -Naur shadow-4.0.18.2.orig/src/useradd.c shadow-4.0.18.2/src/useradd.c
 --- shadow-4.0.18.2.orig/src/useradd.c  2007-10-07 07:36:51.000000000 -0700
-+++ shadow-4.0.18.2/src/useradd.c       2007-10-29 23:33:26.000000000 -0700
-@@ -203,14 +203,14 @@
++++ shadow-4.0.18.2/src/useradd.c       2007-10-30 02:32:55.000000000 -0700
+@@ -203,6 +203,10 @@
         long gid;
         char *errptr;
@@ -18 +18 @@
 +
         gid = strtol (grname, &errptr, 10);
--       if (*errptr || errno == ERANGE || gid < 0) {
--               fprintf (stderr,
--                        _("%s: invalid numeric argument '%s'\n"), Prog,
--                        grname);
--               exit (E_BAD_ARG);
--       }
+        if (*errptr || errno == ERANGE || gid < 0) {
+                fprintf (stderr,
+@@ -210,7 +214,7 @@
+                         grname);
+                exit (E_BAD_ARG);
+        }
 -       return getgrnam (grname);
-+       if (*grname != '\0' && *errptr == '\0' && errno != ERANGE && gid >= 0)
-+               return getgrgid (gid);
 +       return getgrgid (gid);
  }
@@ -33 +31 @@
 diff -Naur shadow-4.0.18.2.orig/src/usermod.c shadow-4.0.18.2/src/usermod.c
 --- shadow-4.0.18.2.orig/src/usermod.c  2007-10-27 06:01:19.000000000 -0700
-+++ shadow-4.0.18.2/src/usermod.c       2007-10-29 23:34:42.000000000 -0700
++++ shadow-4.0.18.2/src/usermod.c       2007-10-30 02:32:14.000000000 -0700
 @@ -165,10 +165,14 @@
         long val;
@@ -50 +48 @@
  
  /*
-