summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2005-10-17 15:59:33 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:47:08 -0500
commit2a57a3ded39b97f67282a2ae7d4b28626fa76f67 (patch)
tree1f0fe1168cdc0c3264532dd9e5cb3e533cbc364c
parent0a3ca819ce04a3e7bde51416139188e27c575deb (diff)
downloadsamba-2a57a3ded39b97f67282a2ae7d4b28626fa76f67.tar.gz
samba-2a57a3ded39b97f67282a2ae7d4b28626fa76f67.tar.bz2
samba-2a57a3ded39b97f67282a2ae7d4b28626fa76f67.zip
Fix for bug #3146
(This used to be commit 86fd63bebe314d1137c01fc6b0cf097e8ddabb17)
-rw-r--r--docs/manpages-3/smbmount.8.xml4
-rw-r--r--docs/smbdotconf/security/hostsdeny.xml7
2 files changed, 9 insertions, 2 deletions
diff --git a/docs/manpages-3/smbmount.8.xml b/docs/manpages-3/smbmount.8.xml
index 68e0b351e0..c8eaa664f2 100644
--- a/docs/manpages-3/smbmount.8.xml
+++ b/docs/manpages-3/smbmount.8.xml
@@ -69,8 +69,8 @@
<varlistentry>
<term>password=&lt;arg&gt;</term>
<listitem><para>specifies the SMB password. If this
- option is not given then the environment variable
- <envar>PASSWD</envar> is used. If it can find
+ option is not given then the environment variable
+ <literal>PASSWD</literal> is used. If it can find
no password <command>smbmount</command> will prompt
for a passeword, unless the guest option is
given. </para>
diff --git a/docs/smbdotconf/security/hostsdeny.xml b/docs/smbdotconf/security/hostsdeny.xml
index ab254aeb6f..0f2241cb32 100644
--- a/docs/smbdotconf/security/hostsdeny.xml
+++ b/docs/smbdotconf/security/hostsdeny.xml
@@ -10,6 +10,13 @@
services unless the specific services have their own lists to override
this one. Where the lists conflict, the <parameter moreinfo="none">allow</parameter>
list takes precedence.</para>
+
+ <para>
+ In the event that it is necessary to deny all by default, use the keyword
+ ALL (or the netmask <literal>0.0.0.0/0</literal>) and then explicitly specify
+ to the <link linkend="hostsallow">hosts allow</link> parameter those hosts
+ that should be permitted access.
+ </para>
</description>
<value type="default"><comment>none (i.e., no hosts specifically excluded)</comment></value>