[packages/shadow.git] / shadow-chage_expdays.patch

diff -Nur shadow-4.0.0.orig/src/chage.c shadow-4.0.0/src/chage.c
--- shadow-4.0.0.orig/src/chage.c	Mon Oct  9 20:39:50 2000
+++ shadow-4.0.0/src/chage.c	Sat Jun  1 09:27:14 2002
@@ -121,6 +121,7 @@
 #define	CLOSE_FAIL	"failed rewriting %s\n"
 
 #define	EPOCH		"1969-12-31"
+#define	EPOCH_SHORT	"12/31/69"
 
 #ifdef	SHADOWPWD
 #define	DBMERROR2	"error updating DBM shadow entry.\n"
@@ -342,7 +343,7 @@
 	 */
 
 	printf(_("Account Expires:\t"));
-	if (expdays <= 0) {
+	if (expdays == -1) {
 		printf (_("Never\n"));
 	} else {
 		expires = expdays * SCALE;
@@ -509,7 +510,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;
Commit	Line	Data
d6ecb3f3	1	diff -Nur shadow-4.0.0.orig/src/chage.c shadow-4.0.0/src/chage.c
d6ecb3f3	2	--- shadow-4.0.0.orig/src/chage.c Mon Oct 9 20:39:50 2000
650a2b39	3	+++ shadow-4.0.0/src/chage.c Sat Jun 1 09:27:14 2002
d6ecb3f3	4	@@ -121,6 +121,7 @@
	5	#define CLOSE_FAIL "failed rewriting %s\n"
	6
	7	#define EPOCH "1969-12-31"
	8	+#define EPOCH_SHORT "12/31/69"
	9
	10	#ifdef SHADOWPWD
	11	#define DBMERROR2 "error updating DBM shadow entry.\n"
650a2b39	12	@@ -342,7 +343,7 @@
	13	*/
	14
	15	printf(_("Account Expires:\t"));
	16	- if (expdays <= 0) {
	17	+ if (expdays == -1) {
	18	printf (_("Never\n"));
	19	} else {
	20	expires = expdays * SCALE;
d6ecb3f3	21	@@ -509,7 +510,10 @@
	22	case 'E':
	23	Eflg++;
	24	if (!isnum(optarg))
	25	- expdays = strtoday (optarg);
	26	+ if (strcmp (optarg, EPOCH_SHORT) == 0)
	27	+ expdays = -1;
	28	+ else
	29	+ expdays = strtoday (optarg);
	30	else
	31	expdays = strtol (optarg, 0, 10);
	32	break;