o move passwd.conf variables into login.conf

o no longer install passwd.conf (but it is used if it exists and the
needed info is not in login.conf)
o added passwordtime and minpasswordlen login.conf variables

src/etc/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.122 2001/05/30 02:11:04 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.123 2001/06/18 21:09:22 millert Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	US/Pacific
@@ -16,7 +16,7 @@ BIN1=	bootptab changelist ccd.conf csh.cshrc csh.login csh.logout \
 	daily dhcpd.conf dhcpd.interfaces dm.conf exports ftpusers \
 	ftpchroot gettytab group hosts hosts.lpd inetd.conf \
 	ksh.kshrc locate.rc man.conf monthly motd mrouted.conf \
-	myname netstart networks newsyslog.conf passwd.conf \
+	myname netstart networks newsyslog.conf \
 	phones printcap protocols rbootd.conf rc rc.conf rc.local \
 	rc.securelevel rc.shutdown remote rpc security services \
 	shells syslog.conf weekly etc.${MACHINE}/disktab dhclient.conf \

src/etc/login.conf

@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2001/05/29 21:32:54 millert Exp $
+# $OpenBSD: login.conf,v 1.5 2001/06/18 21:09:22 millert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -24,6 +24,8 @@ default:\
 	:maxproc-cur=64:\
 	:openfiles-cur=64:\
 	:stacksize-cur=4M:\
+	:localcipher=blowfish,6:\
+	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
@@ -38,6 +40,7 @@ daemon:\
 	:maxproc=infinity:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
+	:localcipher=blowfish,8:\
 	:tc=default:
 
 #

src/etc/mtree/special

@@ -1,4 +1,4 @@
-#	$OpenBSD: special,v 1.33 2001/06/11 20:11:23 mickey Exp $
+#	$OpenBSD: special,v 1.34 2001/06/18 21:09:23 millert Exp $
 #	$NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
@@ -35,6 +35,7 @@ inetd.conf	type=file mode=0644 uname=root gname=wheel
 kerberosIV	type=dir mode=0755 uname=root gname=wheel optional ignore
 ..	#kerberosIV
 host.random	type=file mode=0600 uname=root gname=wheel optional
+login.conf	type=file mode=0644 uname=root gname=wheel
 mail.rc		type=file mode=0644 uname=root gname=wheel
 mailer.conf	type=file mode=0644 uname=root gname=wheel
 master.passwd	type=file mode=0600 uname=root gname=wheel
@@ -50,7 +51,7 @@ special		type=file mode=0600 uname=root gname=wheel
 ..	#mtree
 netstart	type=file mode=0644 uname=root gname=wheel
 passwd		type=file mode=0644 uname=root gname=wheel
-passwd.conf	type=file mode=0644 uname=root gname=wheel
+passwd.conf	type=file mode=0644 uname=root gname=wheel optional
 primes		type=file mode=0644 uname=root gname=wheel
 printcap	type=file mode=0644 uname=root gname=wheel
 rc		type=file mode=0644 uname=root gname=wheel

src/etc/passwd.conf

@@ -1,26 +0,0 @@
-#	$OpenBSD: passwd.conf,v 1.10 1999/06/14 06:51:35 deraadt Exp $
-#
-# Passwd configuration file
-#
-# Possible stanzas are:
-#       'default', username or .groupname
-# Possible options are at the moment:
-#	localcipher, ypcipher
-# they can take values of
-#	old		- old unix style salt of 12bit (YP client compatible)
-#	newsalt,x	- DES hash with salt of 24 bit, x a 24-bit integer
-#			  specifiying the number of rounds.
-#	md5		- MD5 hashing algorithm
-#	blowfish,x	- Blowfish cipher, 2^x is number of rounds (BEST!)
-#			  128 bit salt, 2^4 rounds are min, 2^31 max
-#
-# EXAMPLE to give members of group .wheel blowfish passwords
-#.wheel:
-#        localcipher=blowfish,7
-
-default:
-	localcipher=blowfish,6
-	ypcipher=old
-
-root:
-	localcipher=blowfish,8

src/lib/libutil/pw_getconf.3

@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pw_getconf.3,v 1.6 2000/08/02 21:36:07 aaron Exp $
+.\"	$OpenBSD: pw_getconf.3,v 1.7 2001/06/18 21:09:23 millert Exp $
 .\"
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 16, 1997
+.Dd June 18, 2001
 .Dt PW_GETCONF 3
 .Os
 .Sh NAME
@@ -39,6 +39,15 @@
 .Ft void
 .Fn pw_getconf "char *data" "size_t len" "const char *key" "const char *option"
 .Sh DESCRIPTION
+.Bf -symbolic
+This interface is made obsolete by
+.Xr login_cap 3 .
+The
+.Fn pw_getconf
+function will be removed in a future release of
+.Ox .
+.Ef
+.Pp
 The
 .Fn pw_getconf
 function reads
@@ -64,5 +73,7 @@ An empty string is also returned for other errors.
 .It Pa /etc/passwd.conf
 .El
 .Sh SEE ALSO
+.Xr login_cap 3 ,
+.Xr login.conf 5 ,
 .Xr passwd 5 ,
 .Xr passwd.conf 5