From: John Terpstra Date: Wed, 6 Jul 2005 04:05:49 +0000 (+0000) Subject: More fixups. X-Git-Tag: samba-3.3.0pre1~1935 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbcea7ca3f89e298bec36b16f9aa7bc650440302;p=thirdparty%2Fsamba.git More fixups. --- diff --git a/docs/smbdotconf/filename/vetofiles.xml b/docs/smbdotconf/filename/vetofiles.xml index 9115da6f7c6..637e82449f0 100644 --- a/docs/smbdotconf/filename/vetofiles.xml +++ b/docs/smbdotconf/filename/vetofiles.xml @@ -27,14 +27,11 @@ Setting this parameter will affect the performance of Samba, as it will be forced to check all files and directories for a match as they are scanned. - -hide files -case sensitive -No files or directories are vetoed. - - -; Veto any files containing the word Security, + + Examples of use include: + +; Veto any files containing the word Security, ; any ending in .tmp, and any directory containing the ; word root. veto files = /*Security*/*.tmp/*root*/ @@ -42,5 +39,12 @@ veto files = /*Security*/*.tmp/*root*/ ; Veto the Apple specific files that a NetAtalk server ; creates. veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/ - + + + + +hide files +case sensitive + +No files or directories are vetoed. diff --git a/docs/smbdotconf/filename/vetooplockfiles.xml b/docs/smbdotconf/filename/vetooplockfiles.xml index a8b27977964..b5ef0df5a6e 100644 --- a/docs/smbdotconf/filename/vetooplockfiles.xml +++ b/docs/smbdotconf/filename/vetooplockfiles.xml @@ -19,7 +19,13 @@ To cause Samba not to grant oplocks on these files you would use the line (either in the [global] section or in the section for the particular NetBench share : + + + An example of use is: + +veto oplock files = /.*SEM/ + + No files are vetoed for oplock grants -/.*SEM/ diff --git a/docs/smbdotconf/printing/lprmcommand.xml b/docs/smbdotconf/printing/lprmcommand.xml index 3b2c20d478a..f98825348a9 100644 --- a/docs/smbdotconf/printing/lprmcommand.xml +++ b/docs/smbdotconf/printing/lprmcommand.xml @@ -18,10 +18,19 @@ path in the lprm command as the PATH may not be available to the server. + + Examples of use are: + +lprm command = /usr/bin/lprm -P%p %j + +or + +lprm command = /usr/bin/cancel %p-%j + + + printing -depends on the setting of printing -/usr/bin/lprm -P%p %j -/usr/bin/cancel %p-%j + determined by printing parameter diff --git a/docs/smbdotconf/security/passdbbackend.xml b/docs/smbdotconf/security/passdbbackend.xml index d8fc6cd4881..74f26b89ea1 100644 --- a/docs/smbdotconf/security/passdbbackend.xml +++ b/docs/smbdotconf/security/passdbbackend.xml @@ -63,16 +63,27 @@ + - + Examples of use are: + +passdb backend = tdbsam:/etc/samba/private/passdb.tdb \ + smbpasswd:/etc/samba/smbpasswd -smbpasswd +or + +passdb backend = ldapsam:ldaps://ldap.example.com -tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd +or -ldapsam:ldaps://ldap.example.com +passdb backend = ldapsam:"ldap://ldap-1.example.com \ + ldap://ldap-2.example.com" -ldapsam:"ldap://ldap-1.example.com ldap://ldap-2.example.com" +or -mysql:my_plugin_args tdbsam +passdb backend = mysql:my_plugin_args tdbsam + + + +smbpasswd diff --git a/docs/smbdotconf/security/restrictanonymous.xml b/docs/smbdotconf/security/restrictanonymous.xml index dad6846cee7..a7aaa31b0b2 100644 --- a/docs/smbdotconf/security/restrictanonymous.xml +++ b/docs/smbdotconf/security/restrictanonymous.xml @@ -7,9 +7,12 @@ The setting of this parameter determines whether user and group list information is returned for an anonymous connection. and mirrors the effects of the - HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\LSA\RestrictAnonymous registry key in Windows - 2000 and Windows NT. When set to 0, user and group list - information is returned to anyone who asks. When set + +HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\ + Control\LSA\RestrictAnonymous + + registry key in Windows 2000 and Windows NT. When set to 0, user + and group list information is returned to anyone who asks. When set to 1, only an authenticated user can retrive user and group list information. For the value 2, supported by Windows 2000/XP and Samba, no anonymous connections are allowed at diff --git a/docs/smbdotconf/security/smbpasswdfile.xml b/docs/smbdotconf/security/smbpasswdfile.xml index 021aaf79e81..b21da8e1ae0 100644 --- a/docs/smbdotconf/security/smbpasswdfile.xml +++ b/docs/smbdotconf/security/smbpasswdfile.xml @@ -6,8 +6,14 @@ This option sets the path to the encrypted smbpasswd file. By default the path to the smbpasswd file is compiled into Samba. + + + An example of use is: + +smb passwd file = /etc/samba/smbpasswd + + ${prefix}/private/smbpasswd -/etc/samba/smbpasswd diff --git a/docs/smbdotconf/security/usernamemap.xml b/docs/smbdotconf/security/usernamemap.xml index 1ac393393bd..1c76d317111 100644 --- a/docs/smbdotconf/security/usernamemap.xml +++ b/docs/smbdotconf/security/usernamemap.xml @@ -110,8 +110,14 @@ guest = * to the fully qualified username (i.e. DOMAIN\user) only after the user has been successfully authenticated. + + + An example of use is: + +username map = /usr/local/samba/lib/users.map + + no username map -/usr/local/samba/lib/users.map