Made more reasonable as a set of defaults. Remove cruft, fix a couple

of errors and eliminate cap_mkdb errors. Closes PR misc/2551.

1 files changed, 47 insertions, 45 deletions

diff --git a/etc/login.conf b/etc/login.conf
index d010022..2b658ab 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -32,16 +32,16 @@ auth-ftp-defaults:\
 
 default:\
 	:cputime=infinity:\
-	:coredumpsize=infinity:\
-	:datasize=16M:\
+	:datasize-cur=16M:\
+	:stacksize-cur=8M:\
+	:memorylocked-cur=10M:\
+	:memoryuse-cur=30M:\
 	:filesize=infinity:\
-	:maxproc=64:\
-	:memorylocked=10M:\
-	:memoryuse=30M:\
-	:openfiles=64:\
+	:coredumpsize=infinity:\
+	:maxproc-cur=64:\
+	:openfiles-cur=64:\
 	:priority=0:\
 	:requirehome:\
-	:stacksize=2M:\
 	:term=dumb:\
 	:umask=022:\
 	:rc=auth-defaults:
@@ -53,34 +53,37 @@ default:\
 standard:\
 	:copyright=/etc/COPYRIGHT:\
 	:welcome=/etc/motd:\
-	:setenv=MAIL=/var/mail/$ BLOCKSIZE=K EDITOR=/usr/bin/ee:\
+	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\
 	:path=~/bin /bin /usr/bin /usr/local/bin:\
 	:manpath=/usr/share/man /usr/local/man:\
 	:nologin=/etc/nologin:\
-	:coredumpsize=8M:\
 	:cputime=1h30m:\
 	:datasize=8M:\
 	:stacksize=2M:\
-	:filesize=8M:\
 	:memorylocked=4M:\
 	:memoryuse=8M:\
+	:filesize=8M:\
+	:coredumpsize=8M:\
 	:openfiles=24:\
 	:maxproc=32:\
 	:priority=0:\
 	:requirehome:\
+	:passwordperiod=90d:\
 	:umask=002:\
 	:ignoretime@:\
 	:tc=default:
 
+
 #
 # users of X (needs more resources!)
 #
 xuser:\
 	:manpath=/usr/share/man /usr/X11R6/man /usr/local/man:\
-	:cputime=4M:\
+	:cputime=4h:\
+	:datasize=12M:\
 	:stacksize=4M:\
 	:filesize=8M:\
-	:memoryuse=12M:\
+	:memoryuse=16M:\
 	:openfiles=32:\
 	:maxproc=48:\
 	:tc=standard:
@@ -88,10 +91,8 @@ xuser:\
 
 #
 # Staff users - few restrictions and allow login anytime
-#		display staff motd
 #
 staff:\
-	:welcome=/etc/motd-staff:\
 	:ignorenologin:\
 	:ignoretime:\
 	:requirehome@:\
@@ -106,51 +107,64 @@ staff:\
 #
 root:\
 	:path=~/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\
+	:cputime=infinity:\
+	:datasize=infinity:\
+	:stacksize=infinity:\
+	:memorylocked=infinity:\
+	:memoryuse=infinity:\
+	:filesize=infinity:\
+	:coredumpsize=infinity:\
+	:openfiles=infinity:\
+	:maxproc=infinity:\
+	:memoryuse-cur=32M:\
+	:maxproc-cur=64:\
+	:openfiles-cur=256:\
+	:priority=0:\
+	:requirehome@:\
 	:umask=022:\
 	:tc=auth-root-defaults:\
-	:tc=staff:
 
 
 #
 # Settings used by /etc/rc
 #
 daemon:\
-	:cputime=unlimited:\
+	:cputime=infinity:\
 	:filesize=64M:\
 	:datasize=32M:\
-	:stacksize=32M:\
+	:stacksize=16M:\
 	:coredumpsize=0:\
-	:memoryuse=64M:\
-	:memorylocked=64M:\
+	:memoryuse-cur=64M:\
+	:memorylocked-cur=64M:\
 	:maxproc=32:\
 	:openfiles=256:\
 	:tc=default:
 
 
 #
-# Settings used by news subsystem daemons
+# Settings used by news subsystem
 #
 news:\
-	:cputime=unlimited:\
-	:filesize=128:\
-	:datasize=64M:\
-	:stacksize=32M:\
-	:coredumpsize=0:\
-	:maxmemorysize=128M:\
-	:lockedmemory=32M:\
+	:path=/usr/local/news/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\
+	:cputime=infinity:\
+	:filesize=128M:\
+	:datasize-curr=64M:\
+	:stacksize-cur=32M:\
+	:coredumpsize-cur=0:\
+	:maxmemorysize-cur=128M:\
+	:memorylocked=32M:\
 	:maxproc=128:\
 	:openfiles=256:\
-	:tc=default:\
+	:tc=default:
 
 
 #
 # The dialer class should be used for a dialup PPP/SLIP accounts
-# Welcome messages/news suppressed and a special shell selector
+# Welcome messages/news suppressed
 #
 dialer:\
 	:hushlogin:\
 	:requirehome@:\
-	:shell=/usr/sbin/userls:\
 	:cputime=unlimited:\
 	:filesize=2M:\
 	:datasize=2M:\
@@ -185,11 +199,7 @@ site:\
 	:weektime@:\
 	:monthtime@:\
 	:warntime@:\
-	:tty.allow=dialin:\
-	:tty.deny=:\
-	:host.allow=:\
-	:host.deny=:\
-	:accounted@:
+	:accounted@:\
 	:tc=dialer:\
 	:tc=staff:
 
@@ -200,7 +210,6 @@ site:\
 
 subscriber|Subscribers:\
 	:accounted:\
-	:passwordperiod=90d:\
 	:refreshtime=180d:\
 	:refreshperiod@:\
 	:sessionlimit@:\
@@ -216,26 +225,19 @@ subscriber|Subscribers:\
 	:weektime=40h:\
 	:monthtime=120h:\
 	:warntime=4h:\
-	:tty.allow=dialin,pty,vt:\
-	:tty.deny=:\
-	:times.allow=Any0000-2400:\
-	:times.deny=Mo0900-1200,Fr2120-2130:\
 	:tc=standard:
 
 
 #
 # Subscriber accounts. These accounts have their login times
 # accounted and have access limits applied.
-# Userls is a user shell selector - do not use these classes without it!
 #
-subppp|Dual PPP/SLIP Subscriber Accounts:\
-	:shell=/usr/sbin/userls:\
+subppp|PPP Subscriber Accounts:\
 	:tc=dialer:\
 	:tc=subscriber:
 
 
-subslip|Dual PPP/SLIP Subscriber Accounts:\
-	:shell=/usr/sbin/userls:\
+subslip|SLIP Subscriber Accounts:\
 	:tc=dialer:\
 	:tc=subscriber: