From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 7 Jun 2006 21:37:15 +0000 (+0000)
Subject: - updated  to 4.0.16
X-Git-Tag: auto/th/shadow-4_0_18_1-0_13~26
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=11492b73c50350ab6ce18602a8b9a06df8b7e219;p=packages%2Fshadow.git

- updated  to 4.0.16

Changed files:
    shadow-chage_expdays.patch -> 1.5
---

diff --git a/shadow-chage_expdays.patch b/shadow-chage_expdays.patch
index e3c688e..880ebba 100644
--- a/shadow-chage_expdays.patch
+++ b/shadow-chage_expdays.patch
@@ -1,6 +1,5 @@
-diff -urN shadow-4.0.6.orig/src/chage.c shadow-4.0.6/src/chage.c
---- shadow-4.0.6.orig/src/chage.c	2004-11-18 15:47:10.970295408 +0100
-+++ shadow-4.0.6/src/chage.c	2004-11-18 21:36:19.617616944 +0100
+--- shadow-4.0.6/src/chage.c	2004-11-18 21:36:19.617616944 +0100
++++ shadow-4.0.16/src/chage.c	2006-06-08 00:30:20.837211299 +0300
 @@ -84,7 +84,7 @@
  extern int sp_dbm_mode;
  #endif
@@ -28,25 +27,24 @@ diff -urN shadow-4.0.6.orig/src/chage.c shadow-4.0.6/src/chage.c
  		expdays = -1;
  	else if ((expdays = strtoday (buf)) == -1)
  		return 0;
-@@ -279,7 +279,7 @@
+@@ -274,7 +274,7 @@
+ 	 * password expiring or not.
  	 */
- 
  	printf (_("Account expires\t\t\t\t\t\t: "));
--	if (expdays <= 0) {
+-	if (expdays < 0) {
 +	if (expdays == -1) {
  		printf (_("never\n"));
  	} else {
  		expires = expdays * SCALE;
-@@ -422,7 +422,11 @@
- 		case 'E':
- 			Eflg++;
- 			if (!isnum (optarg))
--				expdays = strtoday (optarg);
-+                                 if (strcmp (optarg, EPOCH_SHORT) == 0)
-+                                         expdays = -1;
-+                                 else
-+                                         expdays = strtoday (optarg);
-+					
- 			else
- 				expdays = strtol (optarg, 0, 10);
- 			break;
+@@ -403,7 +403,10 @@
+ 			case 'E':
+ 				Eflg++;
+ 				if (!isnum (optarg))
+-					expdays = strtoday (optarg);
++					if (strcmp (optarg, EPOCH_SHORT) == 0)
++						expdays = -1;
++					else
++						expdays = strtoday (optarg);
+ 				else
+ 					expdays = strtol (optarg, 0, 10);
+ 				break;