diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-12-16 11:41:20 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-12-16 11:41:20 +1100 |
| commit | f448fde4e35e56508ad93be8de9f60d88e8b8dcd (patch) | |
| tree | 597b58ba1af03f5250af918ec15300c385281706 /docs-xml | |
| parent | a226d86dcec393b2cd657d5441c3041dfdf5cd8f (diff) | |
| parent | 530758dc2a6dd6dce083789b328e16e51ba6573d (diff) | |
| download | samba-f448fde4e35e56508ad93be8de9f60d88e8b8dcd.tar.gz samba-f448fde4e35e56508ad93be8de9f60d88e8b8dcd.tar.bz2 samba-f448fde4e35e56508ad93be8de9f60d88e8b8dcd.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'docs-xml')
| -rw-r--r-- | docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml | 2 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/misc/socketaddress.xml | 12 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/security/accessbasedshareenum.xml | 18 |
3 files changed, 26 insertions, 6 deletions
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml b/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml index b2b3ebd5b1..d1895829a9 100644 --- a/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml +++ b/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml @@ -1850,7 +1850,7 @@ net idmap dump /var/lib/samba/winbindd_idmap.tdb > idmap_dump.txt <para> The IDMAP dump file can be restored using the following command: <screen> -net idmap restore <full_path_and_tdb_filename> < dumpfile.txt +net idmap restore idmap_dump.txt </screen> Where the Samba run-time tdb files are stored in the <filename>/var/lib/samba</filename> directory the following command can be used to restore the data to the tdb file: diff --git a/docs-xml/smbdotconf/misc/socketaddress.xml b/docs-xml/smbdotconf/misc/socketaddress.xml index 7566380e70..17018efd40 100644 --- a/docs-xml/smbdotconf/misc/socketaddress.xml +++ b/docs-xml/smbdotconf/misc/socketaddress.xml @@ -4,12 +4,14 @@ developer="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> - <para>This option allows you to control what - address Samba will listen for connections on. This is used to - support multiple virtual interfaces on the one server, each + <para>This option allows you to control what + address Samba will listen for connections on. This is used to + support multiple virtual interfaces on the one server, each with a different configuration.</para> - - <para>By default Samba will accept connections on any + <para>Setting this option should never be necessary on usual Samba + servers running only one nmbd.</para> + + <para>By default Samba will accept connections on any address.</para> </description> diff --git a/docs-xml/smbdotconf/security/accessbasedshareenum.xml b/docs-xml/smbdotconf/security/accessbasedshareenum.xml new file mode 100644 index 0000000000..c2977c47ae --- /dev/null +++ b/docs-xml/smbdotconf/security/accessbasedshareenum.xml @@ -0,0 +1,18 @@ +<samba:parameter name="access based share enum" + type="boolean" + context="S" + basic="1" advanced="1" developer="1" + xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> + <synonym>public</synonym> + <description> + <para>If this parameter is <constant>yes</constant> for a + service, then the share hosted by the service will only be visible + to users who have read or write access to the share during share + enumeration (for example net view \\sambaserver). This has + parallels to access based enumeration, the main difference being + that only share permissions are evaluated, and security + descriptors on files contained on the share are not used in + computing enumeration access rights.</para> + </description> + <value type="default">no</value> +</samba:parameter> |