7 files changed, 18 insertions, 16 deletions

diff --git a/etc/login.conf b/etc/login.conf
index 73e59fd10da3..243356b580e6 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -9,7 +9,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-#	$Id: login.conf,v 1.28 1999/04/08 12:41:02 ache Exp $
+#	$Id: login.conf,v 1.29 1999/04/28 20:12:53 jkh Exp $
 #
 
 # Default settings effectively disable resource limits, see the
@@ -137,7 +137,7 @@ russian:Russian Users Accounts:\
 #	:maxproc=32:\
 #	:priority=0:\
 #	:requirehome:\
-#	:passwordperiod=90d:\
+#	:passwordtime=90d:\
 #	:umask=002:\
 #	:ignoretime@:\
 #	:tc=default:
@@ -255,7 +255,7 @@ russian:Russian Users Accounts:\
 ##
 #site:\
 #	:ignoretime:\
-#	:passwordperiod@:\
+#	:passwordtime@:\
 #	:refreshtime@:\
 #	:refreshperiod@:\
 #	:sessionlimit@:\
diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5
index 7d4d91662ecd..bc26b280688e 100644
--- a/lib/libutil/login.conf.5
+++ b/lib/libutil/login.conf.5
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $Id: login.conf.5,v 1.14 1998/02/14 16:12:53 steve Exp $
+.\" $Id: login.conf.5,v 1.15 1998/02/21 23:29:59 fenner Exp $
 .\"
 .Dd November 22, 1996
 .Dt LOGIN.CONF 5
@@ -306,7 +306,7 @@ devices in the group.
 If both lists are given and are non-empty, the user is restricted to those
 devices allowed by ttys.allow that are not available by ttys.deny.
 .Sh ACCOUNTING LIMITS
-.Bl -column passwordperiod indent indent
+.Bl -column host.accounted indent indent
 .Sy Name	Type	Notes	Description
 .It accounted	bool	false	Enable session time accounting for all users
 in this class.
@@ -323,7 +323,9 @@ login sessions will be accounted.
 login session accounting is exempted.
 .It idletime	time		Maximum idle time before logout.
 .It monthtime 	time		Maximum login time per month.
-.It passwordtime	time		Time for password expiry.
+.It passwordtime	time		Used by
+.Xr passwd 1
+to set next password expiry date.
 .It refreshtime 	time		New time allowed on account refresh.
 .It refreshperiod	str		How often account time is refreshed.
 .It sessiontime 	time		Maximum login time per session.
diff --git a/release/picobsd/dial/floppy.tree/etc/login.conf b/release/picobsd/dial/floppy.tree/etc/login.conf
index 9361a33c2f9e..451dc8ad51f6 100644
--- a/release/picobsd/dial/floppy.tree/etc/login.conf
+++ b/release/picobsd/dial/floppy.tree/etc/login.conf
@@ -1,7 +1,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-#	$Id: login.conf,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+#	$Id: login.conf,v 1.2 1999/01/12 14:09:19 asami Exp $
 #
 
 
@@ -57,7 +57,7 @@ standard:\
 	:maxproc=32:\
 	:priority=0:\
 	:requirehome:\
-	:passwordperiod=90d:\
+	:passwordtime=90d:\
 	:umask=002:\
 	:ignoretime@:\
 	:tc=default:
diff --git a/release/picobsd/isp/floppy.tree/etc/login.conf b/release/picobsd/isp/floppy.tree/etc/login.conf
index 9361a33c2f9e..f98143a538c8 100644
--- a/release/picobsd/isp/floppy.tree/etc/login.conf
+++ b/release/picobsd/isp/floppy.tree/etc/login.conf
@@ -1,7 +1,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-#	$Id: login.conf,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+#	$Id: login.conf,v 1.2 1999/01/12 14:09:20 asami Exp $
 #
 
 
@@ -57,7 +57,7 @@ standard:\
 	:maxproc=32:\
 	:priority=0:\
 	:requirehome:\
-	:passwordperiod=90d:\
+	:passwordtime=90d:\
 	:umask=002:\
 	:ignoretime@:\
 	:tc=default:
diff --git a/release/picobsd/net/floppy.tree/etc/login.conf b/release/picobsd/net/floppy.tree/etc/login.conf
index 8e0451e1d2d7..b93cac178e5e 100644
--- a/release/picobsd/net/floppy.tree/etc/login.conf
+++ b/release/picobsd/net/floppy.tree/etc/login.conf
@@ -1,7 +1,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-#	$Id: login.conf,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $
+#	$Id: login.conf,v 1.2 1999/01/12 14:09:21 asami Exp $
 #
 
 
@@ -57,7 +57,7 @@ standard:\
 	:maxproc=32:\
 	:priority=0:\
 	:requirehome:\
-	:passwordperiod=90d:\
+	:passwordtime=90d:\
 	:umask=002:\
 	:ignoretime@:\
 	:tc=default:
diff --git a/release/picobsd/router/floppy.tree/etc/login.conf b/release/picobsd/router/floppy.tree/etc/login.conf
index caa56994130b..9dcf20718497 100644
--- a/release/picobsd/router/floppy.tree/etc/login.conf
+++ b/release/picobsd/router/floppy.tree/etc/login.conf
@@ -1,7 +1,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-#	$Id: login.conf,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $
+#	$Id: login.conf,v 1.2 1999/01/12 14:09:22 asami Exp $
 #
 
 
@@ -57,7 +57,7 @@ standard:\
 	:maxproc=32:\
 	:priority=0:\
 	:requirehome:\
-	:passwordperiod=90d:\
+	:passwordtime=90d:\
 	:umask=002:\
 	:ignoretime@:\
 	:tc=default:
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 457c7c2bd1e1..2bb08d57bb83 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)passwd.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\"	$Id: passwd.1,v 1.13 1999/01/23 08:36:38 markm Exp $
 .\"
 .Dd June 6, 1993
 .Dt PASSWD 1
@@ -80,7 +80,7 @@ is used to update the password databases.
 .Pp
 .El
 When changing local or NIS password, the next password change date
-is set according to "passwordperiod" capability in the user's
+is set according to "passwordtime" capability in the user's
 login class.
 .Pp
 To change another user's Kerberos password, one must first