diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-11-19 03:03:34 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-11-19 03:03:34 +0000 |
commit | 57f82da6b779cb98db8e4d4a21d8a0243b2df4cf (patch) | |
tree | 6510052cae192d75627b9d73fbf97dbfefd9c8b3 /etc | |
parent | 609fff5f56c4c6b6642b51839db4c15f047c3e4b (diff) |
zap trailing spaces and tabs
Diffstat (limited to 'etc')
-rw-r--r-- | etc/daily | 4 | ||||
-rw-r--r-- | etc/ksh.kshrc | 16 | ||||
-rw-r--r-- | etc/login.conf | 4 | ||||
-rw-r--r-- | etc/mrouted.conf | 12 | ||||
-rw-r--r-- | etc/protocols | 4 | ||||
-rw-r--r-- | etc/rc.conf | 6 | ||||
-rw-r--r-- | etc/remote | 4 | ||||
-rw-r--r-- | etc/rpc | 4 | ||||
-rw-r--r-- | etc/services | 4 |
9 files changed, 29 insertions, 29 deletions
diff --git a/etc/daily b/etc/daily index 785b734a0be..9dc4bc1ffb3 100644 --- a/etc/daily +++ b/etc/daily @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: daily,v 1.38 2001/10/29 18:16:23 millert Exp $ +# $OpenBSD: daily,v 1.39 2001/11/19 03:03:33 deraadt Exp $ # From: @(#)daily 8.2 (Berkeley) 1/25/94 # PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin @@ -170,7 +170,7 @@ if [ -f /etc/Distfile ]; then logf=`date +%Y.%b.%e` rdist -f /etc/Distfile 2>&1 | tee /var/log/rdist/$logf else - rdist -f /etc/Distfile + rdist -f /etc/Distfile fi fi diff --git a/etc/ksh.kshrc b/etc/ksh.kshrc index e05dd2da4ad..110d089193f 100644 --- a/etc/ksh.kshrc +++ b/etc/ksh.kshrc @@ -1,8 +1,8 @@ : -# $OpenBSD: ksh.kshrc,v 1.7 2001/04/30 18:24:21 marc Exp $ +# $OpenBSD: ksh.kshrc,v 1.8 2001/11/19 03:03:33 deraadt Exp $ # # NAME: -# ksh.kshrc - global initialization for ksh +# ksh.kshrc - global initialization for ksh # # DESCRIPTION: # Each invocation of /bin/ksh processes the file pointed @@ -26,9 +26,9 @@ # This file is provided in the hope that it will # be of use. There is absolutely NO WARRANTY. # Permission to copy, redistribute or otherwise -# use this file is hereby granted provided that +# use this file is hereby granted provided that # the above copyright notice and this notice are -# left intact. +# left intact. case "$-" in *i*) # we are interactive @@ -55,7 +55,7 @@ case "$-" in tty=`tty` tty=`basename $tty` TTY=${TTY:-$tty} - + set -o emacs alias ls='ls -CF' @@ -153,13 +153,13 @@ case "$-" in alias df='df -k' alias du='du -k' ;; - esac + esac alias rsize='eval `resize`' case "$TERM" in sun*|xterm*) case $tty in - tty[p-w]*) + tty[p-w]*) case "$DISPLAY" in "") DISPLAY="`who | grep $TTY | sed -n 's/.*(\([^:)]*\)[:)].*/\1/p' | sed 's/\([a-zA-Z][^.]*\).*/\1/'`:0" @@ -203,6 +203,6 @@ pre_path () { } # if $1 is in path, remove it del_path () { - no_path $* || eval ${2:-PATH}=`eval echo :'$'${2:-PATH}: | + no_path $* || eval ${2:-PATH}=`eval echo :'$'${2:-PATH}: | sed -e "s;:$1:;:;g" -e "s;^:;;" -e "s;:\$;;"` } diff --git a/etc/login.conf b/etc/login.conf index 0aaa1d28b70..1e9bc41f54d 100644 --- a/etc/login.conf +++ b/etc/login.conf @@ -1,4 +1,4 @@ -# $OpenBSD: login.conf,v 1.9 2001/08/09 15:45:24 millert Exp $ +# $OpenBSD: login.conf,v 1.10 2001/11/19 03:03:33 deraadt Exp $ # # Sample login.conf file. See login.conf(5) for details. @@ -30,7 +30,7 @@ auth-defaults:auth=krb4-or-pwd,krb4,krb5-or-pwd,krb5,passwd,skey,activ,crypto,sn # Default authentication methods for ftp (krb4-or-pwd by default) auth-ftp-defaults:auth-ftp=krb4-or-pwd,krb4,krb5-or-pwd,krb5,passwd,skey,activ,crypto,snk,token: -# +# # The default values # To alter the default authentication types change the line: # :tc=auth-defaults:\ diff --git a/etc/mrouted.conf b/etc/mrouted.conf index 905b59eedd0..6cd21c7e6e2 100644 --- a/etc/mrouted.conf +++ b/etc/mrouted.conf @@ -1,4 +1,4 @@ -# $OpenBSD: mrouted.conf,v 1.5 1996/07/20 00:15:54 deraadt Exp $ +# $OpenBSD: mrouted.conf,v 1.6 2001/11/19 03:03:33 deraadt Exp $ # # This is the configuration file for "mrouted", an IP multicast router. # mrouted looks for it in "/etc/mrouted.conf". @@ -10,11 +10,11 @@ # pruning on # # phyint <local-addr> [disable] [metric <m>] [threshold <t>] [rate_limit <b>] -# [boundary (<boundname>|<scoped-addr>/<mask-len>)] -# [altnet (<subnet>/<mask-len>|<subnet>)] -# tunnel <local-addr> <remote-addr> [srcrt] [metric <m>] -# [threshold <t>] [rate_limit <b>] -# [boundary (<boundname>|<scoped-addr>/<mask-len>)] +# [boundary (<boundname>|<scoped-addr>/<mask-len>)] +# [altnet (<subnet>/<mask-len>|<subnet>)] +# tunnel <local-addr> <remote-addr> [srcrt] [metric <m>] +# [threshold <t>] [rate_limit <b>] +# [boundary (<boundname>|<scoped-addr>/<mask-len>)] # # NOTE: any phyint commands MUST precede any tunnel commands # NOTE: the mask-len is the no. of leading 1's in the mask diff --git a/etc/protocols b/etc/protocols index ff73a7be6e8..11f31fa737d 100644 --- a/etc/protocols +++ b/etc/protocols @@ -1,7 +1,7 @@ # # Internet (IP) protocols # -# $OpenBSD: protocols,v 1.12 2000/12/21 14:48:26 reinhard Exp $ +# $OpenBSD: protocols,v 1.13 2001/11/19 03:03:33 deraadt Exp $ # # Updated based on RFC 1340, Assigned Numbers (July 1992). # See also http://www.isi.edu/in-notes/iana/assignments/protocol-numbers @@ -109,4 +109,4 @@ gmtp 100 GMTP # GMTP pim 103 PIM # Protocol Independent Multicast ipcomp 108 IPComp # IP Payload Compression Protocol vrrp 112 VRRP # Virtual Router Redundancy Protocol -reserved 255 Reserved # +reserved 255 Reserved # diff --git a/etc/rc.conf b/etc/rc.conf index b9b08e681b2..2e555a95209 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.70 2001/10/12 22:40:58 jakob Exp $ +# $OpenBSD: rc.conf,v 1.71 2001/11/19 03:03:33 deraadt Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags routed_flags=NO # for normal use: "-q" @@ -11,8 +11,8 @@ rarpd_flags=NO # for normal use: "-a" bootparamd_flags=NO # for normal use: "" rbootd_flags=NO # for normal use: "" sshd_flags="" # for normal use: "" -smtpfwdd_flags=NO # for normal use: ""; be sure to configure smtpd(8) - # and sendmail(8) to use MSA only +smtpfwdd_flags=NO # for normal use: ""; be sure to configure smtpd(8) + # and sendmail(8) to use MSA only named_flags=NO # for normal use: "" rdate_flags=NO # for normal use: name of RFC868 timeserver timed_flags=NO # for normal use: "" diff --git a/etc/remote b/etc/remote index db8669d3e60..b50813d6af4 100644 --- a/etc/remote +++ b/etc/remote @@ -36,9 +36,9 @@ # a) Multiple :tc=XXX: capabilities are allowed, so that # various general pieces can be assembled into one # system description. -# b) Only the first capability with the same name is +# b) Only the first capability with the same name is # used. So capabilitites included a with :tc=XXX: can -# be overridden by assigning them a value before +# be overridden by assigning them a value before # including them. e.g. ":oe=^Z:" in doshost below. # # See cgetcap(3) for details on capability databases. @@ -1,5 +1,5 @@ # -# $OpenBSD: rpc,v 1.2 1996/05/26 10:25:29 deraadt Exp $ +# $OpenBSD: rpc,v 1.3 2001/11/19 03:03:33 deraadt Exp $ # from: rpc 88/08/01 4.0 RPCSRC; from 1.12 88/02/07 SMI # portmapper 100000 portmap sunrpc @@ -29,7 +29,7 @@ status 100024 bootparam 100026 ypupdated 100028 ypupdate keyserv 100029 keyserver -tfsd 100037 +tfsd 100037 nsed 100038 nsemntd 100039 pcnfsd 150001 pcnfs diff --git a/etc/services b/etc/services index 6b87ac5ba5d..86afbe9aa56 100644 --- a/etc/services +++ b/etc/services @@ -1,4 +1,4 @@ -# $OpenBSD: services,v 1.36 2001/10/24 03:27:32 mickey Exp $ +# $OpenBSD: services,v 1.37 2001/11/19 03:03:33 deraadt Exp $ # # Network services, Internet style # @@ -223,7 +223,7 @@ rkinit 2108/tcp # Kerberos remote kinit kx 2111/tcp # X over kerberos kip 2112/tcp # IP over kerberos kauth 2120/tcp # Remote kauth -# +# # AFS Services # afs3-fileserver 7000/udp # AFS fileserver |