[Pkg-shadow-commits] r1336 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-11-10 15:51:38 +0000 (Sat, 10 Nov 2007)
New Revision: 1336

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/src/useradd.c
Log:
Allow non numerical group identifier to be specified with useradd's -g
option. Applied Debian patch 397_non_numerical_identifier. Thanks also to
Greg Schafer <gschafer at zip.com.au>.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-10-30 18:42:21 UTC (rev 1335)
+++ upstream/trunk/ChangeLog	2007-11-10 15:51:38 UTC (rev 1336)
@@ -1,3 +1,10 @@
+2007-11-10  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* NEWS, src/useradd.c: allow non numerical group identifier to be
+	specified with useradd's -g option. Applied Debian patch
+	397_non_numerical_identifier. Thanks also to Greg Schafer
+	<gschafer at zip.com.au>.
+
 2007-10-28  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* configure.in: Prepare the next release: 4.0.18.2. The gettext

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2007-10-30 18:42:21 UTC (rev 1335)
+++ upstream/trunk/NEWS	2007-11-10 15:51:38 UTC (rev 1336)
@@ -1,5 +1,12 @@
 $Id: NEWS,v 1.492 2007/02/01 20:49:25 kloczek Exp $
 
+shadow-4.0.18.1 -> shadow-4.0.18.2					UNRELEASED
+
+*** general:
+- useradd: Allow non numerical group identifier to be specified with
+  useradd's -g option. Applied Debian patch 397_non_numerical_identifier.
+  Thanks also to Greg Schafer <gschafer at zip.com.au>.
+
 shadow-4.0.18.1 -> shadow-4.0.18.2					28-10-2007
 
 *** general:

Modified: upstream/trunk/src/useradd.c
===================================================================
--- upstream/trunk/src/useradd.c	2007-10-30 18:42:21 UTC (rev 1335)
+++ upstream/trunk/src/useradd.c	2007-11-10 15:51:38 UTC (rev 1336)
@@ -204,12 +204,8 @@
 	char *errptr;
 
 	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 (*grname != '\0' && *errptr == '\0' && errno != ERANGE && gid >= 0)
+		return getgrgid (gid);
 	return getgrnam (grname);
 }