diff --git a/src/etc/afs/afsd.conf b/src/etc/afs/afsd.conf
index d8aa5a2d..ab1dbb01 100644
--- a/src/etc/afs/afsd.conf
+++ b/src/etc/afs/afsd.conf
@@ -1,7 +1,7 @@
 #
 # afsd configuration file
 #
-# $OpenBSD: afsd.conf,v 1.7 2004/01/19 02:13:16 beck Exp $
+# $OpenBSD: afsd.conf,v 1.8 2005/02/07 06:08:10 david Exp $
 #
 # The upper limit of (afsd) vnodes (think files and directories)
 # (high-water mark)
@@ -20,7 +20,7 @@ low_vnodes 9000
 # caches up to 2G are not unusual for heavy AFS users.
 # Make sure that the cache file system (/var/spool/afs by default)
 # has enough space.
-# 
+#
 high_bytes 128M
 #
 # The number of bytes we try to use
diff --git a/src/etc/bind/db.localhost b/src/etc/bind/db.localhost
index 2bed2a01..340e9895 100644
--- a/src/etc/bind/db.localhost
+++ b/src/etc/bind/db.localhost
@@ -1,9 +1,9 @@
-; $OpenBSD: db.localhost,v 1.1 2003/01/20 22:30:13 jakob Exp $
+; $OpenBSD: db.localhost,v 1.2 2005/02/07 06:08:10 david Exp $
 
 $ORIGIN localhost.
 $TTL 6h
 
-@	IN	SOA	localhost. root.localhost. (	
+@	IN	SOA	localhost. root.localhost. (
 			1	; serial
 			1h	; refresh
 			30m	; retry
diff --git a/src/etc/bind/db.loopback b/src/etc/bind/db.loopback
index ba5bfe4f..9badc8ba 100644
--- a/src/etc/bind/db.loopback
+++ b/src/etc/bind/db.loopback
@@ -1,9 +1,9 @@
-; $OpenBSD: db.loopback,v 1.1 2003/01/20 22:30:13 jakob Exp $
+; $OpenBSD: db.loopback,v 1.2 2005/02/07 06:08:10 david Exp $
 
 $ORIGIN 127.in-addr.arpa.
 $TTL 6h
 
-@	IN	SOA	localhost. root.localhost. (	
+@	IN	SOA	localhost. root.localhost. (
 			1	; serial
 			1h	; refresh
 			30m	; retry
diff --git a/src/etc/bind/db.loopback6.arpa b/src/etc/bind/db.loopback6.arpa
index d849b79e..558fa236 100644
--- a/src/etc/bind/db.loopback6.arpa
+++ b/src/etc/bind/db.loopback6.arpa
@@ -1,9 +1,9 @@
-; $OpenBSD: db.loopback6.arpa,v 1.1 2003/01/20 22:30:13 jakob Exp $
+; $OpenBSD: db.loopback6.arpa,v 1.2 2005/02/07 06:08:10 david Exp $
 
 $ORIGIN 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa.
 $TTL 6h
 
-@	IN	SOA	localhost. root.localhost. (	
+@	IN	SOA	localhost. root.localhost. (
 			1	; serial
 			1h	; refresh
 			30m	; retry
diff --git a/src/etc/etc.alpha/disktab b/src/etc/etc.alpha/disktab
index 4d594b1b..e56f674a 100644
--- a/src/etc/etc.alpha/disktab
+++ b/src/etc/etc.alpha/disktab
@@ -1,4 +1,4 @@
-#	$OpenBSD: disktab,v 1.14 2002/06/09 06:15:14 todd Exp $
+#	$OpenBSD: disktab,v 1.15 2005/02/07 06:08:10 david Exp $
 #	$NetBSD: disktab,v 1.2 1995/10/13 03:09:39 cgd Exp $
 
 # A DEC RZ25, configured so that all of the free partition IDs are at
@@ -11,10 +11,10 @@ rz25|RZ25|DEC RZ25 SCSI:\
 	:pd#600408:od#223200:bd#8192:fd#1024:td=4.2BSD:
 
 floppy|floppy3|3in|3.5in High Density Floppy:\
-        :dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
-        :pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD: \
-        :pb#2880:ob#0:\
-        :pc#2880:oc#0:
+	:dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+	:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD: \
+	:pb#2880:ob#0:\
+	:pc#2880:oc#0:
 
 rdroot:\
 	:ty=ramdisk:se#512:nt#2:rm#300:ns#8:nc#384:\
diff --git a/src/etc/etc.i386/Makefile.inc b/src/etc/etc.i386/Makefile.inc
index a4af8081..314f1e75 100644
--- a/src/etc/etc.i386/Makefile.inc
+++ b/src/etc/etc.i386/Makefile.inc
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile.inc,v 1.14 2004/08/26 03:34:16 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.15 2005/02/07 06:08:10 david Exp $
 #	etc.i386/Makefile.inc -- i386-specific etc Makefile targets
 
 .ifdef DESTDIR
-snap_md: bsd bsd.mp notes bootblocks distrib 
+snap_md: bsd bsd.mp notes bootblocks distrib
 	cp ${.CURDIR}/../sys/arch/i386/compile/GENERIC/bsd \
 	    ${DESTDIR}/snapshot/bsd
 	cp ${.CURDIR}/../sys/arch/i386/compile/GENERIC.MP/bsd \
diff --git a/src/etc/etc.i386/disktab b/src/etc/etc.i386/disktab
index 2043714f..0a4075fd 100644
--- a/src/etc/etc.i386/disktab
+++ b/src/etc/etc.i386/disktab
@@ -1,4 +1,4 @@
-#	$OpenBSD: disktab,v 1.17 2004/11/25 22:02:08 deraadt Exp $
+#	$OpenBSD: disktab,v 1.18 2005/02/07 06:08:10 david Exp $
 
 # Disk geometry and partition layout tables.
 # Key:
@@ -48,8 +48,8 @@ mk156|toshiba156|Toshiba MK156 156Mb:\
 	:dt=SCSI:ty=winchester:se#512:nt#10:ns#35:nc#825:\
 	:pa#15748:oa#0:ba#4096:fa#512:ta=4.2BSD:\
 	:pb#15748:ob#15748:tb=swap:\
-        :pc#288750:oc#0:\
-	:ph#257250:oh#31500:bh#4096:fh#512:th=4.2BSD:	
+	:pc#288750:oc#0:\
+	:ph#257250:oh#31500:bh#4096:fh#512:th=4.2BSD:
 
 cp3100|Conner Peripherals 100MB IDE:\
 	:dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \
diff --git a/src/etc/etc.sgi/disktab b/src/etc/etc.sgi/disktab
index 92d89493..3021011e 100644
--- a/src/etc/etc.sgi/disktab
+++ b/src/etc/etc.sgi/disktab
@@ -1,4 +1,4 @@
-# Disk geometry and partition layout tables. 
+# Disk geometry and partition layout tables.
 # Key:
 #	dt	controller type
 #	ty	type of disk (fixed, removeable, simulated)
@@ -32,53 +32,53 @@ rdroot|ramdiskroot|RAM-disk root FS image:\
 	:ty=simulated:se#512:nc#16:nt#4:ns#128:\
 	:ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\
 	:ob#0:pb#0:oc#0:pc#8192:
-	
+
 # Seagate ST31200N
 ST31200N-MBR:\
-        :ty=winchester:ns#84:nt#9:nc#2700:\
+	:ty=winchester:ns#84:nt#9:nc#2700:\
 	:pa#65536:oa#4096:ba#8192:fa#1024:ta=4.2bsd:\
-        :pb#131072:ob#69632:bb#8192:fb#1024:tb=swap:\
-        :pc#2037104:oc#4096:bc#8192:fc#1024:\
+	:pb#131072:ob#69632:bb#8192:fb#1024:tb=swap:\
+	:pc#2037104:oc#4096:bc#8192:fc#1024:\
 	:pd#2041200:od#0:bd#8192:fd#1024:\
 	:pe#4064:oe#32:be#8192:fe#1024:te=msdos:\
-        :pg#619200:og#200704:bg#8192:fg#1024:tg=4.2bsd:\
-        :ph#1221296:oh#819904:bh#8192:fh#1024:th=4.2bsd:
+	:pg#619200:og#200704:bg#8192:fg#1024:tg=4.2bsd:\
+	:ph#1221296:oh#819904:bh#8192:fh#1024:th=4.2bsd:
 
 # QUANTUM, Trailblazer 850 with MBR boot.
 TRB850S-MBR:\
-        :ty=winchester:ns#113:nt#4:nc#3653:\
+	:ty=winchester:ns#113:nt#4:nc#3653:\
 	:pa#88096:oa#10240:ba#8192:fa#1024:ta=4.2bsd:\
-        :pb#131072:ob#131072:bb#8192:fb#1024:tb=swap:\
-        :pc#1647060:oc#0:bc#8192:fc#1024:\
-        :pd#10208:od#32:bd#8192:fd#1024:td=msdos:\
-        :pe#586000:oe#229408:be#8192:fe#1024:te=4.2bsd:\
-        :pf#415826:of#815408:bf#8192:ff#1024:tf=4.2bsd:\
-        :pg#415826:og#1231234:bg#8192:fg#1024:tg=4.2bsd:\
-        :ph#831652:oh#815408:bh#8192:fh#1024:th=4.2bsd:
+	:pb#131072:ob#131072:bb#8192:fb#1024:tb=swap:\
+	:pc#1647060:oc#0:bc#8192:fc#1024:\
+	:pd#10208:od#32:bd#8192:fd#1024:td=msdos:\
+	:pe#586000:oe#229408:be#8192:fe#1024:te=4.2bsd:\
+	:pf#415826:of#815408:bf#8192:ff#1024:tf=4.2bsd:\
+	:pg#415826:og#1231234:bg#8192:fg#1024:tg=4.2bsd:\
+	:ph#831652:oh#815408:bh#8192:fh#1024:th=4.2bsd:
 
 #QUANTUM, FIREBALL1080S
 FIREBALL1080S-MBR:\
-        :ty=winchester:ns#139:nt#4:nc#3835:\
+	:ty=winchester:ns#139:nt#4:nc#3835:\
 	:pa#120832:oa#10240:ba#8192:fa#1024:ta=4.2bsd:\
-        :pb#131072:ob#131072:bb#8192:fb#1024:tb=swap:\
-        :pc#2132260:oc#0:bc#8192:fc#1024:\
-        :pd#10208:od#32:bd#8192:fd#1024:td=msdos:\
-        :pe#781250:oe#262144:be#8192:fe#1024:te=4.2bsd:\
-        :pf#544433:of#1043394:bf#8192:ff#1024:tf=4.2bsd:\
-        :pg#544433:og#1587827:bg#8192:fg#1024:tg=4.2bsd:\
-        :ph#1088866:oh#1043394:bh#8192:fh#1024:th=4.2bsd:
+	:pb#131072:ob#131072:bb#8192:fb#1024:tb=swap:\
+	:pc#2132260:oc#0:bc#8192:fc#1024:\
+	:pd#10208:od#32:bd#8192:fd#1024:td=msdos:\
+	:pe#781250:oe#262144:be#8192:fe#1024:te=4.2bsd:\
+	:pf#544433:of#1043394:bf#8192:ff#1024:tf=4.2bsd:\
+	:pg#544433:og#1587827:bg#8192:fg#1024:tg=4.2bsd:\
+	:ph#1088866:oh#1043394:bh#8192:fh#1024:th=4.2bsd:
 
 #QUANTUM, FIREBALL_TM3200S
 FIREBALL_TM3200S-MBR:\
-        :ty=winchester:ns#184:nt#5:nc#6810:\
+	:ty=winchester:ns#184:nt#5:nc#6810:\
 	:pa#120832:oa#10240:ba#8192:fa#1024:ta=4.2bsd:\
-        :pb#131072:ob#131072:bb#8192:fb#1024:tb=swap:\
-        :pc#6265200:oc#0:bc#8192:fc#1024:\
-        :pd#10208:od#32:bd#8192:fd#1024:td=msdos:\
-        :pe#781250:oe#262144:be#8192:fe#1024:te=4.2bsd:\
-        :pf#1205000:of#1043394:bf#8192:ff#1024:tf=4.2bsd:\
-        :pg#2008403:og#2248394:bg#8192:fg#1024:tg=4.2bsd:\
-        :ph#2008403:oh#4256797:bh#8192:fh#1024:th=4.2bsd:
+	:pb#131072:ob#131072:bb#8192:fb#1024:tb=swap:\
+	:pc#6265200:oc#0:bc#8192:fc#1024:\
+	:pd#10208:od#32:bd#8192:fd#1024:td=msdos:\
+	:pe#781250:oe#262144:be#8192:fe#1024:te=4.2bsd:\
+	:pf#1205000:of#1043394:bf#8192:ff#1024:tf=4.2bsd:\
+	:pg#2008403:og#2248394:bg#8192:fg#1024:tg=4.2bsd:\
+	:ph#2008403:oh#4256797:bh#8192:fh#1024:th=4.2bsd:
 
 # QUANTUM ATLAS, XP34300
 XP34300:\
@@ -103,4 +103,4 @@ ZIP-MBR:\
 	:ty=zip:ns#32:nt#64:nc#96:\
 	:pa#188416:oa#4096:ba#8192:fa#1024:ta=4.2bsd:\
 	:pc#192512:oc#4096:bc#8192:fc#1024:\
-        :pd#4064:od#32:bd#8192:fd#1024:td=msdos:\
+	:pd#4064:od#32:bd#8192:fd#1024:td=msdos:\
diff --git a/src/etc/etc.svr4/nsswitch.conf b/src/etc/etc.svr4/nsswitch.conf
index ce8ab7a5..abf0edce 100644
--- a/src/etc/etc.svr4/nsswitch.conf
+++ b/src/etc/etc.svr4/nsswitch.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: nsswitch.conf,v 1.3 2002/06/09 06:15:15 todd Exp $
+#	$OpenBSD: nsswitch.conf,v 1.4 2005/02/07 06:08:10 david Exp $
 #	$NetBSD: nsswitch.conf,v 1.1 1995/07/02 06:29:51 christos Exp $
 # Name service switch file
 #
@@ -7,7 +7,7 @@ networks:   nis files
 protocols:  nis files
 ethers:     nis files
 rpc:        nis files
-netmasks:   nis files	
+netmasks:   nis files
 bootparams: nis files
 services:   files nis
 #
diff --git a/src/etc/etc.vax/disktab b/src/etc/etc.vax/disktab
index 75b9ea9b..898a9687 100644
--- a/src/etc/etc.vax/disktab
+++ b/src/etc/etc.vax/disktab
@@ -1,4 +1,4 @@
-#	$OpenBSD: disktab,v 1.10 2004/04/09 21:50:08 jmc Exp $
+#	$OpenBSD: disktab,v 1.11 2005/02/07 06:08:10 david Exp $
 #	$NetBSD: disktab,v 1.2 1996/03/05 12:01:53 ragge Exp $
 #
 #	@(#)disktab	8.1 (Berkeley) 6/9/93
@@ -481,7 +481,7 @@ ncc2|nec2363|1Gb NEC:\
 	:ty=winchester:ns#64:nt#27:nc#1024:rm#3600:se#512:\
 	:dt=SMD:\
 	:d0#0:\
-        :pa#15884:oa#0:ba#8192:fa#1024:\
+	:pa#15884:oa#0:ba#8192:fa#1024:\
 	:pb#66880:ob#17280:bb#8192:fb#1024:tb=swap:\
 	:pc#1769472:oc#0:bc#8192:fc#1024:\
 	:pd#15884:od#376704:bd#4096:fd#512:\
diff --git a/src/etc/ifstated.conf b/src/etc/ifstated.conf
index a4e65d40..57285e15 100644
--- a/src/etc/ifstated.conf
+++ b/src/etc/ifstated.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: ifstated.conf,v 1.5 2005/02/03 17:51:12 mpf Exp $
+# $OpenBSD: ifstated.conf,v 1.6 2005/02/07 06:08:10 david Exp $
 # This is a sample config for a pair of firewalls with two interfaces
 #
 # carp0 and carp1 have ip addresses on 192.168.3.0/24 and 192.168.6.0/24
@@ -37,8 +37,8 @@ state primary {
 		run "ifconfig carp0 advskew 10"
 		run "ifconfig carp1 advskew 10"
 	}
-        if ! $net
-                set-state demoted
+	if ! $net
+		set-state demoted
 }
 
 state demoted {
@@ -46,8 +46,8 @@ state demoted {
 		run "ifconfig carp0 advskew 254"
 		run "ifconfig carp1 advskew 254"
 	}
-        if $net
-                set-state primary
+	if $net
+		set-state primary
 }
 
 state promoted {
@@ -65,7 +65,7 @@ state backup {
 		run "ifconfig carp1 advskew 100"
 	}
 	# The "sleep 5" below is a hack to dampen the $carp_sync when we come
-        # out of promoted state. Thinking about the correct fix...
+	# out of promoted state. Thinking about the correct fix...
 	if ! $carp_sync && $net && "sleep 5" every 10
 		if ! $carp_sync && $net
 			set-state promoted
diff --git a/src/etc/kerberosV/krb5.conf.example b/src/etc/kerberosV/krb5.conf.example
index 9d430af9..1f436c5f 100644
--- a/src/etc/kerberosV/krb5.conf.example
+++ b/src/etc/kerberosV/krb5.conf.example
@@ -1,4 +1,4 @@
-# $OpenBSD: krb5.conf.example,v 1.5 2003/08/22 13:46:10 hin Exp $
+# $OpenBSD: krb5.conf.example,v 1.6 2005/02/07 06:08:10 david Exp $
 #
 # Example Kerberos 5 configuration file. You may need to change the defaults
 # in this file to match your environment.
@@ -17,7 +17,7 @@
 #
 [libdefaults]
 	# Set the realm of this host here
-        default_realm = MY.REALM
+	default_realm = MY.REALM
 
 	# Maximum allowed time difference between KDC and this host
 	clockskew = 300
diff --git a/src/etc/ksh.kshrc b/src/etc/ksh.kshrc
index 4946f447..5e1760ae 100644
--- a/src/etc/ksh.kshrc
+++ b/src/etc/ksh.kshrc
@@ -1,5 +1,5 @@
 :
-#	$OpenBSD: ksh.kshrc,v 1.11 2002/12/08 22:40:45 marc Exp $
+#	$OpenBSD: ksh.kshrc,v 1.12 2005/02/07 06:08:10 david Exp $
 #
 # NAME:
 #	ksh.kshrc - global initialization for ksh
@@ -36,12 +36,12 @@ case "$-" in
 	# NOTE: SCO-UNIX doesn't have whoami,
 	#	install whoami.sh
 	USER=`whoami 2>/dev/null`
-        USER=${USER:-`id | sed 's/^[^(]*(\([^)]*\)).*/\1/'`}
+	USER=${USER:-`id | sed 's/^[^(]*(\([^)]*\)).*/\1/'`}
 	UID=`id -u`
 	case $UID in
 	0) PS1S='# ';;
 	esac
-        PS1S=${PS1S:-'$ '}
+	PS1S=${PS1S:-'$ '}
 	HOSTNAME=${HOSTNAME:-`uname -n`}
 	HOST=${HOSTNAME%%.*}
 
@@ -54,7 +54,7 @@ case "$-" in
 	# $tty is that which we are in now (might by pty)
 	tty=`tty`
 	tty=`basename $tty`
-        TTY=${TTY:-$tty}
+	TTY=${TTY:-$tty}
 
 	set -o emacs
 
@@ -82,10 +82,10 @@ case "$-" in
 	xterm*)
 		ILS='\033]1;'; ILE='\007'
 		WLS='\033]2;'; WLE='\007'
-                parent="`ps -ax 2>/dev/null | grep $PPID | grep -v grep`"
-                case "$parent" in
+		parent="`ps -ax 2>/dev/null | grep $PPID | grep -v grep`"
+		case "$parent" in
 		*telnet*)
-                  export TERM=xterms;;
+		export TERM=xterms;;
 		esac
 		;;
 	*)	;;
@@ -148,7 +148,7 @@ case "$-" in
 	case $OS in
 	HP-UX)
 		alias ls='ls -CF'
-                ;;
+		;;
 	*BSD)
 		alias df='df -k'
 		alias du='du -k'
diff --git a/src/etc/newsyslog.conf b/src/etc/newsyslog.conf
index afc3ed84..436d5d4b 100644
--- a/src/etc/newsyslog.conf
+++ b/src/etc/newsyslog.conf
@@ -1,8 +1,8 @@
-#	$OpenBSD: newsyslog.conf,v 1.24 2003/11/11 17:00:50 jmc Exp $
+#	$OpenBSD: newsyslog.conf,v 1.25 2005/02/07 06:08:10 david Exp $
 #
 # configuration file for newsyslog
 #
-# logfile_name          owner:group     mode count size when  flags
+# logfile_name		owner:group     mode count size when  flags
 /var/cron/log		root:wheel	600  3     10   *     Z
 /var/log/aculog		uucp:dialer	660  7     *    24    Z
 /var/log/authlog	root:wheel	640  7     *    168   Z
diff --git a/src/etc/rbootd.conf b/src/etc/rbootd.conf
index 2cfba69b..43817e15 100644
--- a/src/etc/rbootd.conf
+++ b/src/etc/rbootd.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rbootd.conf,v 1.4 1996/12/08 21:25:01 tholo Exp $
+#	$OpenBSD: rbootd.conf,v 1.5 2005/02/07 06:08:10 david Exp $
 #
 #	Configuration file for rbootd server.
 #
@@ -8,5 +8,5 @@
 #
 #08:00:09:00:66:ad	SYSHPBSD		# snake (4.3BSD)
 #08:00:09:00:59:17				# vandy (anything)
-#8::9:10:1e:9b		SYSHPUX,hp-ux           # critter (HP-UX)
+#8::9:10:1e:9b		SYSHPUX,hp-ux		# critter (HP-UX)
 #8::9:10:8A:14		SYSHPBSD,SYSHPUX,hp-ux	# jaguar (either)
diff --git a/src/etc/rc.local b/src/etc/rc.local
index 6aa2b410..4cc56919 100644
--- a/src/etc/rc.local
+++ b/src/etc/rc.local
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.local,v 1.36 2004/07/06 04:03:41 henning Exp $
+#	$OpenBSD: rc.local,v 1.37 2005/02/07 06:08:10 david Exp $
 
 # site-specific startup actions, daemons, and other things which
 # can be done AFTER your system goes into securemode.  For actions
@@ -12,7 +12,7 @@ echo -n 'starting local daemons:'
 
 if [ -x /usr/local/sbin/cfsd ]; then
 	if ps auxc | grep -q '^ *root .* mountd$'; then
-		echo -n ' cfsd';        /usr/local/sbin/cfsd >/dev/null 2>&1
+		echo -n ' cfsd';	/usr/local/sbin/cfsd >/dev/null 2>&1
 		mount -o port=3049,nfsv2,intr localhost:/null /crypt
 	else
 		echo -n ' cfsd (failed, no mountd running)'
diff --git a/src/etc/remote b/src/etc/remote
index 0861d471..34f6f796 100644
--- a/src/etc/remote
+++ b/src/etc/remote
@@ -1,4 +1,4 @@
-#	$OpenBSD: remote,v 1.10 2004/04/10 09:07:30 jmc Exp $
+#	$OpenBSD: remote,v 1.11 2005/02/07 06:08:10 david Exp $
 #	from: @(#)remote	8.1 (Berkeley) 6/10/93
 #
 # remote -- remote host description database
@@ -51,7 +51,7 @@ direct:\
 	:dc:
 
 dialup:\
-        :du:at=hayes:pn=\@:
+	:du:at=hayes:pn=\@:
 
 doshost:\
 	:oe=^Z:tc=unixhost:
diff --git a/src/etc/security b/src/etc/security
index 01fe533c..3e52f898 100644
--- a/src/etc/security
+++ b/src/etc/security
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: security,v 1.69 2005/01/06 00:00:38 jmc Exp $
+#	$OpenBSD: security,v 1.70 2005/02/07 06:08:10 david Exp $
 #	from: @(#)security	8.1 (Berkeley) 6/9/93
 #
 
@@ -38,7 +38,7 @@ awk -F: '{
 	if ($2 == "")
 		printf("Login %s has no password.\n", $1);
 	if ($2 != "" && length($2) != 13 && ($10 ~ /.*sh$/ || $10 == "") &&
-           ($2 !~ /^\$[0-9a-f]+\$/) && ($2 != "skey")) {
+	   ($2 !~ /^\$[0-9a-f]+\$/) && ($2 != "skey")) {
 		if (system("test -s /etc/skey/"$1"") == 0)
 			printf("Login %s is off but still has a valid shell and an entry in /etc/skey.\n", $1);
 		if (system("test -d "$9" -a ! -r "$9"") == 0)
@@ -70,9 +70,9 @@ awk -F: '/^[^\+]/ { print $1 " " $3 }' $MP | sort -n +1 | tee $TMP1 |
 uniq -d -f 1 | awk '{ print $2 }' > $TMP2
 if [ -s $TMP2 ] ; then
 	echo "\n${MP} has duplicate user ID's."
-        while read uid; do
-                grep -w $uid $TMP1
-        done < $TMP2 | column
+	while read uid; do
+		grep -w $uid $TMP1
+	done < $TMP2 | column
 fi
 
 # Backup the master password file; a special case, the normal backup
@@ -165,9 +165,9 @@ end-of-csh
 			}
 		     }
 		     $1 ~ /^d....w/ \
-        { print "Root path directory " $10 " is group writable." } \
+	{ print "Root path directory " $10 " is group writable." } \
 		     $1 ~ /^d.......w/ \
-        { print "Root path directory " $10 " is other writable." }' \
+	{ print "Root path directory " $10 " is other writable." }' \
 		< $TMP1 >> $OUTPUT
 	fi
 done
@@ -218,9 +218,9 @@ end-of-sh
 			}
 		     }
 		     $1 ~ /^d....w/ \
-        { print "Root path directory " $10 " is group writable." } \
+	{ print "Root path directory " $10 " is group writable." } \
 		     $1 ~ /^d.......w/ \
-        { print "Root path directory " $10 " is other writable." }' \
+	{ print "Root path directory " $10 " is other writable." }' \
 		< $TMP1 >> $OUTPUT
 
 	fi
diff --git a/src/etc/skel/dot.cshrc b/src/etc/skel/dot.cshrc
index a3a84606..40ed4611 100644
--- a/src/etc/skel/dot.cshrc
+++ b/src/etc/skel/dot.cshrc
@@ -1,4 +1,4 @@
-# $OpenBSD: dot.cshrc,v 1.3 2002/06/09 06:15:15 todd Exp $
+# $OpenBSD: dot.cshrc,v 1.4 2005/02/07 06:08:10 david Exp $
 #
 # csh initialization
 
@@ -24,7 +24,7 @@ if ($?prompt) then
 	set mch = `hostname -s`
 	alias prompt 'set prompt = "$mch:q"":$cwd:t {\!} "'
 	alias cd 'cd \!*; prompt'
-        alias chdir 'cd \!*; prompt'
+	alias chdir 'cd \!*; prompt'
 	alias popd 'popd \!*; prompt'
 	alias pushd 'pushd \!*; prompt'
 	cd .