diff options
| -rw-r--r-- | etc/defaults/rc.conf | 6 | ||||
| -rw-r--r-- | etc/devd.conf | 8 | ||||
| -rw-r--r-- | etc/network.subr | 10 | ||||
| -rwxr-xr-x | etc/periodic/daily/310.accounting | 2 | ||||
| -rwxr-xr-x | etc/periodic/daily/440.status-mailq | 2 | ||||
| -rwxr-xr-x | etc/periodic/weekly/330.catman | 6 | ||||
| -rwxr-xr-x | etc/rc.d/bluetooth | 6 | ||||
| -rwxr-xr-x | etc/rc.d/bridge | 2 | ||||
| -rwxr-xr-x | etc/rc.d/cleanvar | 2 | ||||
| -rwxr-xr-x | etc/rc.d/defaultroute | 2 | ||||
| -rwxr-xr-x | etc/rc.d/geli | 2 | ||||
| -rwxr-xr-x | etc/rc.d/geli2 | 2 | ||||
| -rwxr-xr-x | etc/rc.d/ipfw | 4 | ||||
| -rwxr-xr-x | etc/rc.d/mdconfig | 6 | ||||
| -rwxr-xr-x | etc/rc.d/mdconfig2 | 4 | ||||
| -rwxr-xr-x | etc/rc.d/nscd | 2 | ||||
| -rwxr-xr-x | etc/rc.d/rfcomm_pppd_server | 4 | ||||
| -rwxr-xr-x | etc/rc.d/syscons | 2 | ||||
| -rwxr-xr-x | etc/rc.d/ubthidhci | 4 | ||||
| -rw-r--r-- | etc/rc.firewall | 6 | ||||
| -rw-r--r-- | etc/rc.initdiskless | 2 | ||||
| -rw-r--r-- | etc/regdomain.xml | 18 | ||||
| -rw-r--r-- | etc/services | 18 |
23 files changed, 60 insertions, 60 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 34a44fc3ae5b..60740018c93f 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -217,7 +217,7 @@ ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. #wlandebug_wlan0="scan+auth+assoc" # Set debug flags with wlanddebug(8) #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 @@ -657,11 +657,11 @@ jail_sysvipc_allow="NO" # Allow SystemV IPC use from within a jail #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 diff --git a/etc/devd.conf b/etc/devd.conf index 8827e3b4e035..e249ffd92fa1 100644 --- a/etc/devd.conf +++ b/etc/devd.conf @@ -112,10 +112,10 @@ attach 100 { action "/etc/rc.d/moused quietstart $device-name"; }; -detach 100 { - device-name "ums[0-9]+"; - action "/etc/rc.d/moused stop $device-name"; -}; +detach 100 { + device-name "ums[0-9]+"; + action "/etc/rc.d/moused stop $device-name"; +}; # Firmware download into the ActiveWire board. After the firmware download is # done the device detaches and reappears as something new and shiny diff --git a/etc/network.subr b/etc/network.subr index c36ddbadcb4f..94a8c721659a 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -339,7 +339,7 @@ ifexists() } # ipv4_up if -# add IPv4 addresses to the interface $if +# add IPv4 addresses to the interface $if ipv4_up() { _if=$1 @@ -384,14 +384,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##*/} @@ -404,7 +404,7 @@ ipv4_addrs_common() if [ "${_action}" = "-alias" ]; then _netmask="" fi - + _ipcount=${_iplow} while [ "${_ipcount}" -le "${_iphigh}" ]; do eval "ifconfig ${_if} ${_action} ${_ipnet}.${_ipcount}${_netmask}" diff --git a/etc/periodic/daily/310.accounting b/etc/periodic/daily/310.accounting index ceb140c76b9a..0856399af7fb 100755 --- a/etc/periodic/daily/310.accounting +++ b/etc/periodic/daily/310.accounting @@ -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 diff --git a/etc/periodic/daily/440.status-mailq b/etc/periodic/daily/440.status-mailq index b75e85829e69..d17fe4edf9c2 100755 --- a/etc/periodic/daily/440.status-mailq +++ b/etc/periodic/daily/440.status-mailq @@ -59,7 +59,7 @@ case "$daily_status_mailq_enable" in fi;; esac fi;; - + *) rc=0;; esac diff --git a/etc/periodic/weekly/330.catman b/etc/periodic/weekly/330.catman index e810fcb9645b..1ba2f7e9a973 100755 --- a/etc/periodic/weekly/330.catman +++ b/etc/periodic/weekly/330.catman @@ -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 diff --git a/etc/rc.d/bluetooth b/etc/rc.d/bluetooth index 20e48c637679..183f83552342 100755 --- a/etc/rc.d/bluetooth +++ b/etc/rc.d/bluetooth @@ -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 } diff --git a/etc/rc.d/bridge b/etc/rc.d/bridge index 5c8f61a10a18..272703899c32 100755 --- a/etc/rc.d/bridge +++ b/etc/rc.d/bridge @@ -42,7 +42,7 @@ glob_int () { $2 ) true ;; * ) false ;; esac -} +} bridge_test () { bridge=$1 diff --git a/etc/rc.d/cleanvar b/etc/rc.d/cleanvar index 68e03bdc1119..589db423f1b3 100755 --- a/etc/rc.d/cleanvar +++ b/etc/rc.d/cleanvar @@ -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 diff --git a/etc/rc.d/defaultroute b/etc/rc.d/defaultroute index 35b1c881e378..f78bece54061 100755 --- a/etc/rc.d/defaultroute +++ b/etc/rc.d/defaultroute @@ -26,7 +26,7 @@ defaultroute_start() [ -z "${dhcp_interfaces}" ] && return carrier=false for _if in ${dhcp_interfaces}; do - output=`/sbin/ifconfig ${_if}` + output=`/sbin/ifconfig ${_if}` nocarrier=`expr "${output}" : '.*[[:blank:]]status: \(no carrier\)'` [ -z "${nocarrier}" ] && carrier=true done diff --git a/etc/rc.d/geli b/etc/rc.d/geli index 253dbab47c03..736b10a75198 100755 --- a/etc/rc.d/geli +++ b/etc/rc.d/geli @@ -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 diff --git a/etc/rc.d/geli2 b/etc/rc.d/geli2 index 50f13aad5c57..4726de07ead4 100755 --- a/etc/rc.d/geli2 +++ b/etc/rc.d/geli2 @@ -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 diff --git a/etc/rc.d/ipfw b/etc/rc.d/ipfw index 689905d9e4a8..3818bfcd1e18 100755 --- a/etc/rc.d/ipfw +++ b/etc/rc.d/ipfw @@ -30,14 +30,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 diff --git a/etc/rc.d/mdconfig b/etc/rc.d/mdconfig index 372cd7a4e0a7..093c40212845 100755 --- a/etc/rc.d/mdconfig +++ b/etc/rc.d/mdconfig @@ -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}" diff --git a/etc/rc.d/mdconfig2 b/etc/rc.d/mdconfig2 index efd26a8a14a1..4b1535e8e7c5 100755 --- a/etc/rc.d/mdconfig2 +++ b/etc/rc.d/mdconfig2 @@ -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}" diff --git a/etc/rc.d/nscd b/etc/rc.d/nscd index e66c0ae811f2..42041a75a6ec 100755 --- a/etc/rc.d/nscd +++ b/etc/rc.d/nscd @@ -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}" diff --git a/etc/rc.d/rfcomm_pppd_server b/etc/rc.d/rfcomm_pppd_server index 7b8067e7c3ec..f666684cff09 100755 --- a/etc/rc.d/rfcomm_pppd_server +++ b/etc/rc.d/rfcomm_pppd_server @@ -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 diff --git a/etc/rc.d/syscons b/etc/rc.d/syscons index 67e47af9faee..815f0b27b300 100755 --- a/etc/rc.d/syscons +++ b/etc/rc.d/syscons @@ -121,7 +121,7 @@ syscons_configure_keyboard() syscons_setkeyboard() { kbd=$1 - + if [ -z "${kbd}" ]; then return 1 fi diff --git a/etc/rc.d/ubthidhci b/etc/rc.d/ubthidhci index 67d734603e85..529f8d66835e 100755 --- a/etc/rc.d/ubthidhci +++ b/etc/rc.d/ubthidhci @@ -4,8 +4,8 @@ # # PROVIDE: ubthidhci -# REQUIRE: DAEMON -# BEFORE: bluetooth +# REQUIRE: DAEMON +# BEFORE: bluetooth # KEYWORD: nojail shutdown . /etc/rc.subr diff --git a/etc/rc.firewall b/etc/rc.firewall index cda7c34e1dd0..3db984e22716 100644 --- a/etc/rc.firewall +++ b/etc/rc.firewall @@ -461,7 +461,7 @@ case ${firewall_type} in if [ $ipv6_available -eq 0 ]; then ${fwcmd} add pass udp from fe80::/10 to me 546 in fi - # 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 if [ $ipv6_available -eq 0 ]; then @@ -476,11 +476,11 @@ case ${firewall_type} in # 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. diff --git a/etc/rc.initdiskless b/etc/rc.initdiskless index b35817fb0b5c..e731abbb24ad 100644 --- a/etc/rc.initdiskless +++ b/etc/rc.initdiskless @@ -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 # diff --git a/etc/regdomain.xml b/etc/regdomain.xml index d75d4d7a94f7..d95000c5c0a4 100644 --- a/etc/regdomain.xml +++ b/etc/regdomain.xml @@ -1,7 +1,7 @@ <!-- Copyright (c) 2007-2008 Sam Leffler, Errno Consulting All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -10,7 +10,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 AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -21,7 +21,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + $FreeBSD$ --> @@ -1200,7 +1200,7 @@ <country-codes> <!-- ISO 3166 Country/Region codes and regdomain mapping. - + http://ftp.ics.uci.edu/pub/ietf/http/related/iso3166.txt has the list of codes. XXX this table is incomplete @@ -1291,7 +1291,7 @@ </country> <country id="SV"> <isocc>222</isocc> <name>El Salvador</name> <rd ref="none"/> -</country> +</country> <country id="EE"> <isocc>233</isocc> <name>Estonia</name> <rd ref="etsi"/> </country> @@ -1357,7 +1357,7 @@ </country> <country id="J2"> <isocc>394</isocc> <name>Japan2</name> <rd ref="japan"/> -</country> +</country> <country id="J3"> <isocc>395</isocc> <name>Japan3</name> <rd ref="japan"/> </country> @@ -1366,7 +1366,7 @@ </country> <country id="J5"> <isocc>397</isocc> <name>Japan5</name> <rd ref="japan"/> -</country> +</country> <country id="JO"> <isocc>400</isocc> <name>Jordan</name> <rd ref="none"/> </country> @@ -1528,7 +1528,7 @@ </country> <country id="UZ"> <isocc>860</isocc> <name>Uzbekistan</name> <rd ref="none"/> -</country> +</country> <country id="VE"> <isocc>862</isocc> <name>Venezuela</name> <rd ref="fcc"/> </country> @@ -1549,7 +1549,7 @@ <!-- Band specifications referenced above. - NB: keep sorted by starting frequency, legacy before HT + NB: keep sorted by starting frequency, legacy before HT --> <shared-frequency-bands> <freqband id="F1_4942_4987_5"> diff --git a/etc/services b/etc/services index 5859d46fd83f..519bee3c0759 100644 --- a/etc/services +++ b/etc/services @@ -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 |