diff options
| author | dim <dim@FreeBSD.org> | 2014-12-27 14:58:52 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-12-27 14:58:52 +0000 |
| commit | 1848cf1db38654a8dfebddc939ea4560806c375f (patch) | |
| tree | b5ae6abea47431ce3367e56359a6bc862d797a70 /etc | |
| parent | f0e9784165ce886f2c35a96523b61260ec3bc3cf (diff) | |
| parent | 488bc65a703bf123118544b08e8bb56682e35280 (diff) | |
| download | FreeBSD-src-1848cf1db38654a8dfebddc939ea4560806c375f.zip FreeBSD-src-1848cf1db38654a8dfebddc939ea4560806c375f.tar.gz | |
Merge ^/head r274961 through r276301.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/hosts.allow | 18 | ||||
| -rw-r--r-- | etc/services | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/etc/hosts.allow b/etc/hosts.allow index 95286d7..3e19bc8 100644 --- a/etc/hosts.allow +++ b/etc/hosts.allow @@ -4,15 +4,15 @@ # # NOTE: The hosts.deny file is deprecated. # Place both 'allow' and 'deny' rules in the hosts.allow file. -# See hosts_options(5) for the format of this file. -# hosts_access(5) no longer fully applies. - -# _____ _ _ -# | ____| __ __ __ _ _ __ ___ _ __ | | ___ | | -# | _| \ \/ / / _` | | '_ ` _ \ | '_ \ | | / _ \ | | -# | |___ > < | (_| | | | | | | | | |_) | | | | __/ |_| -# |_____| /_/\_\ \__,_| |_| |_| |_| | .__/ |_| \___| (_) -# |_| +# See hosts_options(5) for the format of this file. +# hosts_access(5) no longer fully applies. +# +# _____ _ _ +# | ____| __ __ __ _ _ __ ___ _ __ | | ___ | | +# | _| \ \/ / / _` | | '_ ` _ \ | '_ \ | | / _ \ | | +# | |___ > < | (_| | | | | | | | | |_) | | | | __/ |_| +# |_____| /_/\_\ \__,_| |_| |_| |_| | .__/ |_| \___| (_) +# |_| # !!! This is an example! You will need to modify it for your specific # !!! requirements! diff --git a/etc/services b/etc/services index 13ad4c8..1311799 100644 --- a/etc/services +++ b/etc/services @@ -2345,6 +2345,8 @@ mdns 5353/tcp #Multicast DNS mdns 5353/udp #Multicast DNS postgresql 5432/tcp #PostgreSQL Database postgresql 5432/udp #PostgreSQL Database +vami 5480/tcp #VMware Appliance Management Interface, HTTPS-like +vami 5480/udp #VMware Appliance Management Interface, HTTPS-like rplay 5555/udp amqp 5672/sctp #AMQP amqp 5672/tcp #AMQP |
