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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2009-04-10 22:34:04 +0000 (Fri, 10 Apr 2009)
New Revision: 2609

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/useradd.c
Log:
	* src/useradd.c: Get rid of strtol.
	* src/useradd.c: Provide better warning in case a default GROUP or
	INACTIVE value is not valid in /etc/default/useradd.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-10 22:33:57 UTC (rev 2608)
+++ upstream/trunk/ChangeLog	2009-04-10 22:34:04 UTC (rev 2609)
@@ -2,6 +2,9 @@
 
 	* src/useradd.c: Re-indent.
 	* src/useradd.c: Use getlong instead of get_number.
+	* src/useradd.c: Get rid of strtol.
+	* src/useradd.c: Provide better warning in case a default GROUP or
+	INACTIVE value is not valid in /etc/default/useradd.
 
 2009-04-06  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/src/useradd.c
===================================================================
--- upstream/trunk/src/useradd.c	2009-04-10 22:33:57 UTC (rev 2608)
+++ upstream/trunk/src/useradd.c	2009-04-10 22:34:04 UTC (rev 2609)
@@ -330,6 +330,9 @@
 				fprintf (stderr,
 				         _("%s: group '%s' does not exist\n"),
 				         Prog, cp);
+				fprintf (stderr,
+				         _("%s: the %s configuration in %s will be ignored\n"),
+				         Prog, DGROUP, def_file);
 			} else {
 				def_group = grp->gr_gid;
 				def_gname = xstrdup (grp->gr_name);
@@ -354,14 +357,14 @@
 		 * Default Password Inactive value
 		 */
 		else if (MATCH (buf, INACT)) {
-			long val = strtol (cp, &ep, 10);
-
-			if (   ('\0' != *cp)
-			    && ('\0' == *ep)
-			    && (ERANGE != errno)
-			    && (val >= 0)) {
-				def_inactive = val;
-			} else {
+			if (   (getlong (cp, &def_inactive) == 0)
+			    || (def_inactive < -1)) {
+				fprintf (stderr,
+				         _("%s: invalid numeric argument '%s'\n"),
+				         Prog, optarg);
+				fprintf (stderr,
+				         _("%s: the %s configuration in %s will be ignored\n"),
+				         Prog, INACT, def_file);
 				def_inactive = -1;
 			}
 		}
@@ -971,9 +974,9 @@
 			{"user-group", no_argument, NULL, 'U'},
 			{NULL, 0, NULL, '\0'}
 		};
-		while ((c =
-			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:U",
-				     long_options, NULL)) != -1) {
+		while ((c = getopt_long (argc, argv,
+			                 "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:U",
+			                 long_options, NULL)) != -1) {
 			switch (c) {
 			case 'b':
 				if (   ( !VALID (optarg) )
@@ -1247,7 +1250,7 @@
 			char *uh;
 
 			uh = xmalloc (strlen (def_home) +
-				      strlen (user_name) + 2);
+			              strlen (user_name) + 2);
 			sprintf (uh, "%s/%s", def_home, user_name);
 			user_home = uh;
 		}