[Pkg-shadow-commits] r458 - branches/experimental/debian/patches

[Christian Perrier]

Author: bubulle
Date: 2005-08-17 09:30:10 +0000 (Wed, 17 Aug 2005)
New Revision: 458

Modified:
   branches/experimental/debian/patches/427_chage_expiry_0
Log:
Refresh to apply cleanly on 4.0.12 (some parts have been applied

Modified: branches/experimental/debian/patches/427_chage_expiry_0
===================================================================
--- branches/experimental/debian/patches/427_chage_expiry_0	2005-08-17 09:27:16 UTC (rev 457)
+++ branches/experimental/debian/patches/427_chage_expiry_0	2005-08-17 09:30:10 UTC (rev 458)
@@ -1,7 +1,7 @@
 Goal: Fix chage display for expiry fields set to 0.
 Fixes: #78961
 
-Status wrt upstream: It should be forwarded to upstream.
+Status wrt upstream: It should be forwarded to upstream. Has been partly applied. One change remain to be applied
 
 Note: On Debian, PAM deals unconsistently with these fields when they are
       set to 0. See #308229.
@@ -22,32 +22,3 @@
  	} else {
  		changed = lastday * SCALE;
  		print_date (changed);
-@@ -255,7 +257,7 @@
- 
- 	printf (_("Password expires\t\t\t\t\t: "));
- 	if (lastday <= 0 || maxdays >= 10000 * (DAY / SCALE)
--	    || maxdays <= 0) {
-+	    || maxdays < 0) {
- 		printf (_("never\n"));
- 	} else {
- 		expires = changed + maxdays * SCALE;
-@@ -270,8 +272,8 @@
- 	 */
- 
- 	printf (_("Password inactive\t\t\t\t\t: "));
--	if (lastday <= 0 || inactdays <= 0 ||
--	    maxdays >= 10000 * (DAY / SCALE) || maxdays <= 0) {
-+	if (lastday <= 0 || inactdays < 0 ||
-+	    maxdays >= 10000 * (DAY / SCALE) || maxdays < 0) {
- 		printf (_("never\n"));
- 	} else {
- 		expires = changed + (maxdays + inactdays) * SCALE;
-@@ -284,7 +286,7 @@
- 	 */
- 
- 	printf (_("Account expires\t\t\t\t\t\t: "));
--	if (expdays <= 0) {
-+	if (expdays < 0) {
- 		printf (_("never\n"));
- 	} else {
- 		expires = expdays * SCALE;