[Pkg-shadow-commits] r1144 - in trunk/debian: . patches

[Christian Perrier]

Author: bubulle
Date: 2006-11-08 20:16:23 +0100 (Wed, 08 Nov 2006)
New Revision: 1144

Added:
   trunk/debian/patches/397_non_numerical_identifier
Removed:
   trunk/debian/patches/497_non_numerical_identifier
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
The 497 patch has been applied upstream

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-10-30 21:57:25 UTC (rev 1143)
+++ trunk/debian/changelog	2006-11-08 19:16:23 UTC (rev 1144)
@@ -26,6 +26,9 @@
     in the etch branch (we don't want regressions):
     - 493_pwck_no_SHADOWPWD: SHADOWPWD no more exist.
       pwck do not detect missing users in /etc/shadow.
+  * Upstream bugs fixed in upstream releases or CVS:
+    - 497_non_numerical_identifier moved as 397_non_numerical_identifier
+      because upstream applied it
 
  -- Christian Perrier <bubulle at debian.org>  Fri, 25 Aug 2006 12:00:51 +0200
 

Copied: trunk/debian/patches/397_non_numerical_identifier (from rev 1143, trunk/debian/patches/497_non_numerical_identifier)
===================================================================
--- trunk/debian/patches/497_non_numerical_identifier	2006-10-30 21:57:25 UTC (rev 1143)
+++ trunk/debian/patches/397_non_numerical_identifier	2006-11-08 19:16:23 UTC (rev 1144)
@@ -0,0 +1,43 @@
+Goal: allow non numerical group identifier to be specified with useradd's
+      and usermod's -g options
+
+Fixes: #381394, #381399, #381404, #381408, #381448
+
+Status wrt upstream: Applied in CVS
+
+Index: shadow-4.0.18.1/src/useradd.c
+===================================================================
+--- shadow-4.0.18.1.orig/src/useradd.c	2006-09-17 12:25:16.499523435 +0200
++++ shadow-4.0.18.1/src/useradd.c	2006-09-17 12:25:28.379617865 +0200
+@@ -206,11 +206,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);
+ }
+ 
+Index: shadow-4.0.18.1/src/usermod.c
+===================================================================
+--- shadow-4.0.18.1.orig/src/usermod.c	2006-09-17 12:25:24.475586833 +0200
++++ shadow-4.0.18.1/src/usermod.c	2006-09-17 12:25:28.383617897 +0200
+@@ -167,11 +167,8 @@
+ 	char *errptr;
+ 
+ 	val = strtol (grname, &errptr, 10);
+-	if (*errptr || errno == ERANGE || val < 0) {
+-		fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
+-			 grname);
+-		exit (E_BAD_ARG);
+-	}
++	if (*grname != '\0' && *errptr == '\0' && errno != ERANGE && val >= 0)
++		return getgrgid (val);
+ 	return getgrnam (grname);
+ }
+ 

Deleted: trunk/debian/patches/497_non_numerical_identifier
===================================================================
--- trunk/debian/patches/497_non_numerical_identifier	2006-10-30 21:57:25 UTC (rev 1143)
+++ trunk/debian/patches/497_non_numerical_identifier	2006-11-08 19:16:23 UTC (rev 1144)
@@ -1,43 +0,0 @@
-Goal: allow non numerical group identifier to be specified with useradd's
-      and usermod's -g options
-
-Fixes: #381394, #381399, #381404, #381408, #381448
-
-Status wrt upstream: Forwarded but not applied yet
-
-Index: shadow-4.0.18.1/src/useradd.c
-===================================================================
---- shadow-4.0.18.1.orig/src/useradd.c	2006-09-17 12:25:16.499523435 +0200
-+++ shadow-4.0.18.1/src/useradd.c	2006-09-17 12:25:28.379617865 +0200
-@@ -206,11 +206,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);
- }
- 
-Index: shadow-4.0.18.1/src/usermod.c
-===================================================================
---- shadow-4.0.18.1.orig/src/usermod.c	2006-09-17 12:25:24.475586833 +0200
-+++ shadow-4.0.18.1/src/usermod.c	2006-09-17 12:25:28.383617897 +0200
-@@ -167,11 +167,8 @@
- 	char *errptr;
- 
- 	val = strtol (grname, &errptr, 10);
--	if (*errptr || errno == ERANGE || val < 0) {
--		fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
--			 grname);
--		exit (E_BAD_ARG);
--	}
-+	if (*grname != '\0' && *errptr == '\0' && errno != ERANGE && val >= 0)
-+		return getgrgid (val);
- 	return getgrnam (grname);
- }
- 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-10-30 21:57:25 UTC (rev 1143)
+++ trunk/debian/patches/series	2006-11-08 19:16:23 UTC (rev 1144)
@@ -37,7 +37,7 @@
 508_nologin_in_usr_sbin
 495_salt_stack_smash
 496_login_init_session
-497_non_numerical_identifier
+397_non_numerical_identifier
 101_ja
 499_gettext-0.15
 102_de-fix-sorry