svn commit: r208095 - in stable/7/etc: . defaults periodic/daily
periodic/weekly rc.d
Doug Barton
dougb at FreeBSD.org
Fri May 14 19:36:12 UTC 2010
Author: dougb
Date: Fri May 14 19:36:11 2010
New Revision: 208095
URL: http://svn.freebsd.org/changeset/base/208095
Log:
MFC 208060:
Remove trailing white space. No functional changes.
Hand-delete trailing ws from rc.firewall while I'm here.
Modified:
stable/7/etc/defaults/rc.conf
stable/7/etc/network.subr
stable/7/etc/periodic/daily/310.accounting
stable/7/etc/periodic/daily/440.status-mailq
stable/7/etc/periodic/weekly/330.catman
stable/7/etc/rc.d/bluetooth
stable/7/etc/rc.d/bridge
stable/7/etc/rc.d/cleanvar
stable/7/etc/rc.d/geli
stable/7/etc/rc.d/geli2
stable/7/etc/rc.d/ipfw
stable/7/etc/rc.d/mdconfig
stable/7/etc/rc.d/mdconfig2
stable/7/etc/rc.d/nscd
stable/7/etc/rc.d/rfcomm_pppd_server
stable/7/etc/rc.d/syscons
stable/7/etc/rc.firewall
stable/7/etc/rc.initdiskless
stable/7/etc/services
Directory Properties:
stable/7/etc/ (props changed)
Modified: stable/7/etc/defaults/rc.conf
==============================================================================
--- stable/7/etc/defaults/rc.conf Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/defaults/rc.conf Fri May 14 19:36:11 2010 (r208095)
@@ -198,7 +198,7 @@ ifconfig_lo0="inet 127.0.0.1" # default
#create_arg_vlan0="vlan 102" # vlan tag for vlan0 device
#ipv4_addrs_fxp0="192.168.0.1/24 192.168.1.1-5/28" # example IPv4 address entry.
#
-#autobridge_interfaces="bridge0" # List of bridges to check
+#autobridge_interfaces="bridge0" # List of bridges to check
#autobridge_bridge0="tap* vlan0" # Interface glob to automatically add to the bridge
#
# If you have any sppp(4) interfaces above, you might also want to set
@@ -636,11 +636,11 @@ jail_sysvipc_allow="NO" # Allow SystemV
#jail_example_rootdir="/usr/jail/default" # Jail's root directory
#jail_example_hostname="default.domain.com" # Jail's hostname
#jail_example_interface="" # Jail's interface variable to create IP aliases on
-#jail_example_fib="0" # Routing table for setfib(1)
+#jail_example_fib="0" # Routing table for setfib(1)
#jail_example_ip="192.0.2.10,2001:db8::17" # Jail's primary IPv4 and IPv6 address
#jail_example_ip_multi0="2001:db8::10" # and another IPv6 address
#jail_example_exec_start="/bin/sh /etc/rc" # command to execute in jail for starting
-#jail_example_exec_afterstart0="/bin/sh command" # command to execute after the one for
+#jail_example_exec_afterstart0="/bin/sh command" # command to execute after the one for
# starting the jail. More than one can be
# specified using a trailing number
#jail_example_exec_stop="/bin/sh /etc/rc.shutdown" # command to execute in jail for stopping
Modified: stable/7/etc/network.subr
==============================================================================
--- stable/7/etc/network.subr Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/network.subr Fri May 14 19:36:11 2010 (r208095)
@@ -308,7 +308,7 @@ ifexists()
}
# ipv4_up if
-# add IPv4 addresses to the interface $if
+# add IPv4 addresses to the interface $if
ipv4_up()
{
_if=$1
@@ -353,14 +353,14 @@ ipv4_down()
# Evaluate the ifconfig_if_ipv4 arguments for interface $if
# and use $action to add or remove IPv4 addresses from $if.
ipv4_addrs_common()
-{
+{
_ret=1
_if=$1
_action=$2
-
+
# get ipv4-addresses
cidr_addr=`get_if_var $_if ipv4_addrs_IF`
-
+
for _cidr in ${cidr_addr}; do
_ipaddr=${_cidr%%/*}
_netmask="/"${_cidr##*/}
@@ -373,7 +373,7 @@ ipv4_addrs_common()
if [ "${_action}" = "-alias" ]; then
_netmask=""
fi
-
+
_ipcount=${_iplow}
while [ "${_ipcount}" -le "${_iphigh}" ]; do
eval "ifconfig ${_if} ${_action} ${_ipnet}.${_ipcount}${_netmask}"
Modified: stable/7/etc/periodic/daily/310.accounting
==============================================================================
--- stable/7/etc/periodic/daily/310.accounting Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/periodic/daily/310.accounting Fri May 14 19:36:11 2010 (r208095)
@@ -29,7 +29,7 @@ case "$daily_accounting_enable" in
cd /var/account
rc=0
-
+
n=$daily_accounting_save
rm -f acct.$n.gz acct.$n || rc=3
m=$n
Modified: stable/7/etc/periodic/daily/440.status-mailq
==============================================================================
--- stable/7/etc/periodic/daily/440.status-mailq Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/periodic/daily/440.status-mailq Fri May 14 19:36:11 2010 (r208095)
@@ -59,7 +59,7 @@ case "$daily_status_mailq_enable" in
fi;;
esac
fi;;
-
+
*) rc=0;;
esac
Modified: stable/7/etc/periodic/weekly/330.catman
==============================================================================
--- stable/7/etc/periodic/weekly/330.catman Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/periodic/weekly/330.catman Fri May 14 19:36:11 2010 (r208095)
@@ -27,13 +27,13 @@ case "$weekly_catman_enable" in
then
if [ -z "${MANPATH}" ]
then
- echo "manpath failed to find any manpath directories"
+ echo "manpath failed to find any manpath directories"
rc=3
else
man_locales=`/usr/bin/manpath -qL`
rc=0
-
- # Preformat original, non-localized manpages
+
+ # Preformat original, non-localized manpages
echo /usr/libexec/catman.local -r "$MANPATH" |
su -fm man || rc=3
Modified: stable/7/etc/rc.d/bluetooth
==============================================================================
--- stable/7/etc/rc.d/bluetooth Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/rc.d/bluetooth Fri May 14 19:36:11 2010 (r208095)
@@ -95,7 +95,7 @@ bluetooth_setup_stack()
hook=$1
shift
- # Setup HCI
+ # Setup HCI
ngctl mkpeer ${dev}: hci ${hook} drv \
> /dev/null 2>&1 || return 1
@@ -282,7 +282,7 @@ bluetooth_start()
;;
esac
- # Be backward compatible and setup reasonable defaults
+ # Be backward compatible and setup reasonable defaults
bluetooth_device_authentication_enable="0"
bluetooth_device_class="ff:01:0c"
bluetooth_device_connectable="1"
@@ -312,7 +312,7 @@ bluetooth_start()
bluetooth_shutdown_stack $dev
err 1 "Unable to setup Bluetooth stack for device ${dev}"
fi
-
+
return 0
}
Modified: stable/7/etc/rc.d/bridge
==============================================================================
--- stable/7/etc/rc.d/bridge Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/rc.d/bridge Fri May 14 19:36:11 2010 (r208095)
@@ -42,7 +42,7 @@ glob_int () {
$2 ) true ;;
* ) false ;;
esac
-}
+}
bridge_test () {
bridge=$1
Modified: stable/7/etc/rc.d/cleanvar
==============================================================================
--- stable/7/etc/rc.d/cleanvar Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/rc.d/cleanvar Fri May 14 19:36:11 2010 (r208095)
@@ -54,7 +54,7 @@ cleanvar_prestart()
rm -f /var/run/clean_var /var/spool/lock/clean_var
}
-cleanvar_start ()
+cleanvar_start ()
{
if [ -d /var/run -a ! -f /var/run/clean_var ]; then
purgedir /var/run
Modified: stable/7/etc/rc.d/geli
==============================================================================
--- stable/7/etc/rc.d/geli Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/rc.d/geli Fri May 14 19:36:11 2010 (r208095)
@@ -11,7 +11,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Modified: stable/7/etc/rc.d/geli2
==============================================================================
--- stable/7/etc/rc.d/geli2 Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/rc.d/geli2 Fri May 14 19:36:11 2010 (r208095)
@@ -11,7 +11,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Modified: stable/7/etc/rc.d/ipfw
==============================================================================
--- stable/7/etc/rc.d/ipfw Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/rc.d/ipfw Fri May 14 19:36:11 2010 (r208095)
@@ -29,14 +29,14 @@ ipfw_prestart()
if ! checkyesno natd_enable; then
required_modules="$required_modules ipfw_nat"
fi
- fi
+ fi
}
ipfw_start()
{
local _firewall_type
- _firewall_type=$1
+ _firewall_type=$1
# set the firewall rules script if none was specified
[ -z "${firewall_script}" ] && firewall_script=/etc/rc.firewall
Modified: stable/7/etc/rc.d/mdconfig
==============================================================================
--- stable/7/etc/rc.d/mdconfig Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/rc.d/mdconfig Fri May 14 19:36:11 2010 (r208095)
@@ -49,7 +49,7 @@ is_readonly()
*" ${_mp} "*read-only*)
echo "yes"
;;
-
+
*)
;;
esac;
@@ -139,7 +139,7 @@ mdconfig_start()
if ! eval ${_fsck_cmd} -p ${_dev} >/dev/null; then
echo "Fsck failed on ${_dev}, not mounting the filesystem."
continue
-
+
fi
else
newfs ${_newfs} ${_dev} >/dev/null
@@ -194,5 +194,5 @@ if [ -z "${_mdconfig_list}" ]; then
fi
done
fi
-
+
run_rc_command "${_mdconfig_cmd}"
Modified: stable/7/etc/rc.d/mdconfig2
==============================================================================
--- stable/7/etc/rc.d/mdconfig2 Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/rc.d/mdconfig2 Fri May 14 19:36:11 2010 (r208095)
@@ -49,7 +49,7 @@ is_readonly()
*" ${_mp} "*read-only*)
echo "yes"
;;
-
+
*)
;;
esac;
@@ -223,5 +223,5 @@ if [ -z "${_mdconfig2_list}" ]; then
fi
done
fi
-
+
run_rc_command "${_mdconfig2_cmd}"
Modified: stable/7/etc/rc.d/nscd
==============================================================================
--- stable/7/etc/rc.d/nscd Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/rc.d/nscd Fri May 14 19:36:11 2010 (r208095)
@@ -34,7 +34,7 @@ _nscd_set_option() {
_nscd_opt_val=$(eval "echo \$nscd_${_optname}")
_cached_opt_val=$(eval "echo \$cached_${_optname}")
-
+
if [ -n "$_cached_opt_val" -a "$_nscd_opt_val" != "$_defoptval" ]; then
warn "You should use nscd_${_optname} instead of" \
"cached_${_optname}"
Modified: stable/7/etc/rc.d/rfcomm_pppd_server
==============================================================================
--- stable/7/etc/rc.d/rfcomm_pppd_server Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/rc.d/rfcomm_pppd_server Fri May 14 19:36:11 2010 (r208095)
@@ -46,7 +46,7 @@ rfcomm_pppd_server_start_profile()
_channel=1
fi
rc_flags="${rc_flags} -C ${_channel}"
-
+
# Check for RFCOMM PPP profile register SP override
#
eval _x=\$rfcomm_pppd_server_${_profile_cleaned}_register_sp
@@ -55,7 +55,7 @@ rfcomm_pppd_server_start_profile()
rc_flags="${rc_flags} -S"
fi
fi
-
+
# Check for RFCOMM PPP profile register DUN override
#
eval _x=\$rfcomm_pppd_server_${_profile_cleaned}_register_dun
Modified: stable/7/etc/rc.d/syscons
==============================================================================
--- stable/7/etc/rc.d/syscons Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/rc.d/syscons Fri May 14 19:36:11 2010 (r208095)
@@ -106,7 +106,7 @@ syscons_configure_keyboard()
syscons_setkeyboard()
{
kbd=$1
-
+
if [ -z "${kbd}" ]; then
return 1
fi
Modified: stable/7/etc/rc.firewall
==============================================================================
--- stable/7/etc/rc.firewall Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/rc.firewall Fri May 14 19:36:11 2010 (r208095)
@@ -310,10 +310,10 @@ case ${firewall_type} in
# offers services.
# firewall_allowservices: List of IPs which has access to
# $firewall_myservices.
- # firewall_trusted: List of IPs which has full access
- # to this host. Be very carefull
+ # firewall_trusted: List of IPs which has full access
+ # to this host. Be very carefull
# when setting this. This option can
- # seriously degrade the level of
+ # seriously degrade the level of
# protection provided by the firewall.
# firewall_logdeny: Boolean (YES/NO) specifying if the
# default denied packets should be
@@ -321,7 +321,7 @@ case ${firewall_type} in
# firewall_nologports: List of TCP/UDP ports for which
# denied incomming packets are not
# logged.
-
+
# Allow packets for which a state has been built.
${fwcmd} add check-state
@@ -337,20 +337,20 @@ case ${firewall_type} in
${fwcmd} add pass udp from 0.0.0.0 68 to 255.255.255.255 67 out
${fwcmd} add pass udp from any 67 to me 68 in
${fwcmd} add pass udp from any 67 to 255.255.255.255 68 in
- # Some servers will ping the IP while trying to decide if it's
+ # Some servers will ping the IP while trying to decide if it's
# still in use.
${fwcmd} add pass icmp from any to any icmptype 8
# Allow "mandatory" ICMP in.
${fwcmd} add pass icmp from any to any icmptype 3,4,11
-
+
# Add permits for this workstations published services below
# Only IPs and nets in firewall_allowservices is allowed in.
- # If you really wish to let anyone use services on your
+ # If you really wish to let anyone use services on your
# workstation, then set "firewall_allowservices='any'" in /etc/rc.conf
#
# Note: We don't use keep-state as that would allow DoS of
- # our statetable.
+ # our statetable.
# You can add 'keep-state' to the lines for slightly
# better performance if you fell that DoS of your
# workstation won't be a problem.
@@ -367,7 +367,7 @@ case ${firewall_type} in
for i in ${firewall_trusted} ; do
${fwcmd} add pass ip from $i to me
done
-
+
${fwcmd} add 65000 count ip from any to any
# Drop packets to ports where we don't want logging
Modified: stable/7/etc/rc.initdiskless
==============================================================================
--- stable/7/etc/rc.initdiskless Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/rc.initdiskless Fri May 14 19:36:11 2010 (r208095)
@@ -119,7 +119,7 @@
# Similar to /conf/T/M/diskless_remount above, but allows
# all of /conf to be remounted. This can be used to allow
# multiple roots to share the same /conf.
-#
+#
#
# You will almost universally want to create the following files under /conf
#
Modified: stable/7/etc/services
==============================================================================
--- stable/7/etc/services Fri May 14 19:28:16 2010 (r208094)
+++ stable/7/etc/services Fri May 14 19:36:11 2010 (r208095)
@@ -1243,8 +1243,8 @@ dctp 675/tcp
dctp 675/udp
vpps-via 676/tcp #VPPS Via
vpps-via 676/udp #VPPS Via
-vpp 677/tcp #Virtual Presence Protocol
-vpp 677/udp #Virtual Presence Protocol
+vpp 677/tcp #Virtual Presence Protocol
+vpp 677/udp #Virtual Presence Protocol
ggf-ncp 678/tcp #GNU Generation Foundation NCP
ggf-ncp 678/udp #GNU Generation Foundation NCP
mrm 679/tcp
@@ -1255,8 +1255,8 @@ entrust-aams 681/tcp
entrust-aams 681/udp
xfr 682/tcp
xfr 682/udp
-corba-iiop 683/tcp #CORBA IIOP
-corba-iiop 683/udp #CORBA IIOP
+corba-iiop 683/tcp #CORBA IIOP
+corba-iiop 683/udp #CORBA IIOP
corba-iiop-ssl 684/tcp #CORBA IIOP SSL
corba-iiop-ssl 684/udp #CORBA IIOP SSL
mdc-portmapper 685/tcp #MDC Port Mapper
@@ -1311,8 +1311,8 @@ cisco-tdp 711/tcp #Cisco TDP
cisco-tdp 711/udp #Cisco TDP
tbrpf 712/tcp
tbrpf 712/udp
-iris-xpc 713/tcp #IRIS over XPC
-iris-xpc 713/udp #IRIS over XPC
+iris-xpc 713/tcp #IRIS over XPC
+iris-xpc 713/udp #IRIS over XPC
iris-xpcs 714/tcp #IRIS over XPCS
iris-xpcs 714/udp #IRIS over XPCS
iris-lwz 715/tcp
@@ -1412,7 +1412,7 @@ pkix-3-ca-ra 829/tcp #PKIX-3 CA/RA
pkix-3-ca-ra 829/udp #PKIX-3 CA/RA
netconf-ssh 830/tcp #NETCONF over SSH
netconf-ssh 830/udp #NETCONF over SSH
-netconf-beep 831/tcp #NETCONF over BEEP
+netconf-beep 831/tcp #NETCONF over BEEP
netconf-beep 831/udp #NETCONF over BEEP
netconfsoaphttp 832/tcp #NETCONF for SOAP over HTTPS
netconfsoaphttp 832/udp #NETCONF for SOAP over HTTPS
@@ -1444,14 +1444,14 @@ ideafarm-chat 902/tcp
ideafarm-chat 902/udp
ideafarm-catch 903/tcp
ideafarm-catch 903/udp
-kink 910/tcp #Kerberized Internet Negotiation of Keys (KINK)
+kink 910/tcp #Kerberized Internet Negotiation of Keys (KINK)
kink 910/udp #Kerberized Internet Negotiation of Keys (KINK)
xact-backup 911/tcp
xact-backup 911/udp
apex-mesh 912/tcp #APEX relay-relay service
apex-mesh 912/udp #APEX relay-relay service
apex-edge 913/tcp #APEX endpoint-relay service
-apex-edge 913/udp #APEX endpoint-relay service
+apex-edge 913/udp #APEX endpoint-relay service
rndc 953/tcp # named's rndc control socket
ftps-data 989/tcp # ftp protocol, data, over TLS/SSL
ftps-data 989/udp
More information about the svn-src-stable
mailing list