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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-11-20 13:09:55 +0000 (Tue, 20 Nov 2007)
New Revision: 1419

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/chgpasswd.c
   upstream/trunk/src/chpasswd.c
Log:
The -c, -e, and -m options are exclusives.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-20 12:59:20 UTC (rev 1418)
+++ upstream/trunk/ChangeLog	2007-11-20 13:09:55 UTC (rev 1419)
@@ -1,5 +1,10 @@
 2007-11-20  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/chgpasswd.c, src/chpasswd.c: The -c, -e, and -m options are
+	exclusives.
+
+2007-11-20  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* man/chpasswd.8.xml, man/chgpasswd.8.xml: Document how the
 	encryption algorithm is chosen for the passwords. Document the new
 	-c and -s options. Add a reference to login.defs(5).

Modified: upstream/trunk/src/chgpasswd.c
===================================================================
--- upstream/trunk/src/chgpasswd.c	2007-11-20 12:59:20 UTC (rev 1418)
+++ upstream/trunk/src/chgpasswd.c	2007-11-20 13:09:55 UTC (rev 1419)
@@ -184,9 +184,10 @@
 			 Prog, "-s", "-c");
 		usage ();
 	}
-	if (md5flg && cflg) {
+	if ((eflg && (md5flg || cflg)) ||
+	    md5flg && cflg) {
 		fprintf (stderr,
-			 _("%s: the -m and -c flags are exclusive\n"),
+			 _("%s: the -c, -e, and -m flags are exclusive\n"),
 			 Prog);
 		usage ();
 	}

Modified: upstream/trunk/src/chpasswd.c
===================================================================
--- upstream/trunk/src/chpasswd.c	2007-11-20 12:59:20 UTC (rev 1418)
+++ upstream/trunk/src/chpasswd.c	2007-11-20 13:09:55 UTC (rev 1419)
@@ -178,9 +178,10 @@
 			 Prog, "-s", "-c");
 		usage ();
 	}
-	if (md5flg && cflg) {
+	if ((eflg && (md5flg || cflg)) ||
+	    md5flg && cflg) {
 		fprintf (stderr,
-			 _("%s: the -m and -c flags are exclusive\n"),
+			 _("%s: the -c, -e, and -m flags are exclusive\n"),
 			 Prog);
 		usage ();
 	}