The Samba-Bugzilla – Attachment 3943 Details for
Bug 6127
Spelling/typography/wording fixes in smb.conf manpage
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to XML files
516047.patch (text/plain), 22.18 KB, created by
Debian samba package maintainers (PUBLIC MAILING LIST)
on 2009-02-19 15:39:30 UTC
(
hide
)
Description:
Patch to XML files
Filename:
MIME Type:
Creator:
Debian samba package maintainers (PUBLIC MAILING LIST)
Created:
2009-02-19 15:39:30 UTC
Size:
22.18 KB
patch
obsolete
>diff -Nru docs-xml.ori/archives/THANKS docs-xml/archives/THANKS >--- docs-xml.ori/archives/THANKS 2009-02-19 20:58:17.841723123 +0100 >+++ docs-xml/archives/THANKS 2009-02-19 22:32:04.866299304 +0100 >@@ -86,7 +86,7 @@ > consulting firm located in Waterloo, Ontario, Canada. We work > with a variety of environments (such as Windows, Windows NT and > Unix), tools and application areas, and can provide assistance for >- development work ranging from a few days to to multiple man-year >+ development work ranging from a few days to multiple man-year > projects. You can find more information at http://www.metrics.com/. > > >diff -Nru docs-xml.ori/smbdotconf/browse/enhancedbrowsing.xml docs-xml/smbdotconf/browse/enhancedbrowsing.xml >--- docs-xml.ori/smbdotconf/browse/enhancedbrowsing.xml 2009-02-19 20:58:17.330532703 +0100 >+++ docs-xml/smbdotconf/browse/enhancedbrowsing.xml 2009-02-19 21:03:49.350633666 +0100 >@@ -17,7 +17,7 @@ > > <para>You may wish to disable this option if you have a problem with empty > workgroups not disappearing from browse lists. Due to the restrictions >- of the browse protocols these enhancements can cause a empty workgroup >+ of the browse protocols, these enhancements can cause a empty workgroup > to stay around forever which can be annoying.</para> > > <para>In general you should leave this option enabled as it makes >diff -Nru docs-xml.ori/smbdotconf/locking/strictlocking.xml docs-xml/smbdotconf/locking/strictlocking.xml >--- docs-xml.ori/smbdotconf/locking/strictlocking.xml 2009-02-19 20:58:17.161715648 +0100 >+++ docs-xml/smbdotconf/locking/strictlocking.xml 2009-02-19 21:17:11.674527309 +0100 >@@ -12,7 +12,7 @@ > <para> > When strict locking is set to Auto (the default), the server performs file lock checks only on non-oplocked files. > As most Windows redirectors perform file locking checks locally on oplocked files this is a good trade off for >- inproved performance. >+ improved performance. > </para> > > <para> >diff -Nru docs-xml.ori/smbdotconf/misc/remoteannounce.xml docs-xml/smbdotconf/misc/remoteannounce.xml >--- docs-xml.ori/smbdotconf/misc/remoteannounce.xml 2009-02-19 20:58:17.178541254 +0100 >+++ docs-xml/smbdotconf/misc/remoteannounce.xml 2009-02-19 22:24:18.166626599 +0100 >@@ -6,7 +6,7 @@ > <description> > <para> > This option allows you to setup <citerefentry><refentrytitle>nmbd</refentrytitle> >- <manvolnum>8</manvolnum></citerefentry>to periodically announce itself >+ <manvolnum>8</manvolnum></citerefentry> to periodically announce itself > to arbitrary IP addresses with an arbitrary workgroup name. > </para> > >@@ -23,7 +23,7 @@ > </programlisting> > the above line would cause <command moreinfo="none">nmbd</command> to announce itself > to the two given IP addresses using the given workgroup names. If you leave out the >- workgroup name then the one given in the <smbconfoption name="workgroup"/> parameter >+ workgroup name, then the one given in the <smbconfoption name="workgroup"/> parameter > is used instead. > </para> > >diff -Nru docs-xml.ori/smbdotconf/misc/usershareallowguests.xml docs-xml/smbdotconf/misc/usershareallowguests.xml >--- docs-xml.ori/smbdotconf/misc/usershareallowguests.xml 2009-02-19 20:58:17.314323615 +0100 >+++ docs-xml/smbdotconf/misc/usershareallowguests.xml 2009-02-19 22:25:16.650632405 +0100 >@@ -8,7 +8,7 @@ > to be accessed by non-authenticated users or not. It is the equivalent > of allowing people who can create a share the option of setting > <parameter moreinfo="none">guest ok = yes</parameter> in a share >- definition. Due to the security sensitive nature of this the default >+ definition. Due to its security sensitive nature, the default > is set to off.</para> > > </description> >diff -Nru docs-xml.ori/smbdotconf/misc/usershareprefixallowlist.xml docs-xml/smbdotconf/misc/usershareprefixallowlist.xml >--- docs-xml.ori/smbdotconf/misc/usershareprefixallowlist.xml 2009-02-19 20:58:17.314323615 +0100 >+++ docs-xml/smbdotconf/misc/usershareprefixallowlist.xml 2009-02-19 21:07:44.922553514 +0100 >@@ -6,8 +6,8 @@ > <description> > <para>This parameter specifies a list of absolute pathnames > the root of which are allowed to be exported by user defined share definitions. >- If the pathname exported doesn't start with one of the strings in this >- list the user defined share will not be allowed. This allows the Samba >+ If the pathname to be exported doesn't start with one of the strings in this >+ list, the user defined share will not be allowed. This allows the Samba > administrator to restrict the directories on the system that can be > exported by user defined shares. > </para> >diff -Nru docs-xml.ori/smbdotconf/misc/usersharetemplateshare.xml docs-xml/smbdotconf/misc/usersharetemplateshare.xml >--- docs-xml.ori/smbdotconf/misc/usersharetemplateshare.xml 2009-02-19 20:58:17.311073906 +0100 >+++ docs-xml/smbdotconf/misc/usersharetemplateshare.xml 2009-02-19 21:13:52.706713440 +0100 >@@ -5,7 +5,7 @@ > xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> > <description> > <para>User defined shares only have limited possible parameters >- such as path, guest ok etc. This parameter allows usershares to >+ such as path, guest ok, etc. This parameter allows usershares to > "cloned" from an existing share. If "usershare template share" > is set to the name of an existing share, then all usershares > created have their defaults set from the parameters set on this >diff -Nru docs-xml.ori/smbdotconf/printing/useclientdriver.xml docs-xml/smbdotconf/printing/useclientdriver.xml >--- docs-xml.ori/smbdotconf/printing/useclientdriver.xml 2009-02-19 20:58:17.170154919 +0100 >+++ docs-xml/smbdotconf/printing/useclientdriver.xml 2009-02-19 21:15:15.210277032 +0100 >@@ -29,7 +29,7 @@ > <para>If this parameter is enabled for a printer, then any attempt > to open the printer with the PRINTER_ACCESS_ADMINISTER right is mapped > to PRINTER_ACCESS_USE instead. Thus allowing the OpenPrinterEx() >- call to succeed. <emphasis>This parameter MUST not be able enabled >+ call to succeed. <emphasis>This parameter MUST not be enabled > on a print share which has valid print driver installed on the Samba > server.</emphasis></para> > </description> >diff -Nru docs-xml.ori/smbdotconf/protocol/aclcheckpermissions.xml docs-xml/smbdotconf/protocol/aclcheckpermissions.xml >--- docs-xml.ori/smbdotconf/protocol/aclcheckpermissions.xml 2009-02-19 20:59:31.554931578 +0100 >+++ docs-xml/smbdotconf/protocol/aclcheckpermissions.xml 2009-02-19 20:55:52.866601683 +0100 >@@ -21,7 +21,7 @@ > and allows the open. If the user doesn't have permission to delete the file this will only be > discovered at close time, which is too late for the Windows user tools to display an error message > to the user. The symptom of this is files that appear to have been deleted "magically" re-appearing >- on a Windows explorer refersh. This is an extremely advanced protocol option which should not >+ on a Windows explorer refresh. This is an extremely advanced protocol option which should not > need to be changed. This parameter was introduced in its final form in 3.0.21, an earlier version > with slightly different semantics was introduced in 3.0.20. That older version is not documented here. > </para> >diff -Nru docs-xml.ori/smbdotconf/protocol/aclcheckpermissions.xml~ docs-xml/smbdotconf/protocol/aclcheckpermissions.xml~ >--- docs-xml.ori/smbdotconf/protocol/aclcheckpermissions.xml~ 2009-02-19 20:58:17.330532703 +0100 >+++ docs-xml/smbdotconf/protocol/aclcheckpermissions.xml~ 1970-01-01 01:00:00.000000000 +0100 >@@ -1,30 +0,0 @@ >-<samba:parameter name="acl check permissions" >- context="S" >- type="boolean" >- advanced="1" wizard="1" >- xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> >-<description> >- <para>This boolean parameter controls what <citerefentry><refentrytitle>smbd</refentrytitle> >- <manvolnum>8</manvolnum></citerefentry>does on receiving a protocol request of "open for delete" >- from a Windows client. If a Windows client doesn't have permissions to delete a file then they >- expect this to be denied at open time. POSIX systems normally only detect restrictions on delete by >- actually attempting to delete the file or directory. As Windows clients can (and do) "back out" a >- delete request by unsetting the "delete on close" bit Samba cannot delete the file immediately >- on "open for delete" request as we cannot restore such a deleted file. With this parameter set to >- true (the default) then smbd checks the file system permissions directly on "open for delete" and denies the >- request without actually deleting the file if the file system permissions would seem to deny it. >- This is not perfect, as it's possible a user could have deleted a file without Samba being able to >- check the permissions correctly, but it is close enough to Windows semantics for mostly correct >- behaviour. Samba will correctly check POSIX ACL semantics in this case. >- </para> >- <para>If this parameter is set to "false" Samba doesn't check permissions on "open for delete" >- and allows the open. If the user doesn't have permission to delete the file this will only be >- discovered at close time, which is too late for the Windows user tools to display an error message >- to the user. The symptom of this is files that appear to have been deleted "magically" re-appearing >- on a Windows explorer refersh. This is an extremely advanced protocol option which should not >- need to be changed. This parameter was introduced in its final form in 3.0.21, an earlier version >- with slightly different semantics was introduced in 3.0.20. That older version is not documented here. >- </para> >-</description> >-<value type="default">True</value> >-</samba:parameter> >diff -Nru docs-xml.ori/smbdotconf/protocol/enableasusupport.xml docs-xml/smbdotconf/protocol/enableasusupport.xml >--- docs-xml.ori/smbdotconf/protocol/enableasusupport.xml 2009-02-19 20:58:17.322602751 +0100 >+++ docs-xml/smbdotconf/protocol/enableasusupport.xml 2009-02-19 21:02:38.502905299 +0100 >@@ -5,7 +5,7 @@ > xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> > <description> > <para>Hosts running the "Advanced Server for Unix (ASU)" product >- require some special accomodations such as creating a builting [ADMIN$] >+ require some special accomodations such as creating a builtin [ADMIN$] > share that only supports IPC connections. The has been the default > behavior in smbd for many years. However, certain Microsoft applications > such as the Print Migrator tool require that the remote server support >diff -Nru docs-xml.ori/smbdotconf/security/clientlanmanauth.xml docs-xml/smbdotconf/security/clientlanmanauth.xml >--- docs-xml.ori/smbdotconf/security/clientlanmanauth.xml 2009-02-19 20:59:48.038773317 +0100 >+++ docs-xml/smbdotconf/security/clientlanmanauth.xml 2009-02-19 20:57:13.054649032 +0100 >@@ -11,7 +11,7 @@ > password hashes (e.g. Windows NT/2000, Samba, etc... but not > Windows 95/98) will be able to be connected from the Samba client.</para> > >- <para>The LANMAN encrypted response is easily broken, due to it's >+ <para>The LANMAN encrypted response is easily broken, due to its > case-insensitive nature, and the choice of algorithm. Clients > without Windows 95/98 servers are advised to disable > this option. </para> >diff -Nru docs-xml.ori/smbdotconf/security/clientlanmanauth.xml~ docs-xml/smbdotconf/security/clientlanmanauth.xml~ >--- docs-xml.ori/smbdotconf/security/clientlanmanauth.xml~ 2009-02-19 20:58:17.554717725 +0100 >+++ docs-xml/smbdotconf/security/clientlanmanauth.xml~ 1970-01-01 01:00:00.000000000 +0100 >@@ -1,28 +0,0 @@ >-<samba:parameter name="client lanman auth" >- context="G" >- type="boolean" >- advanced="1" developer="1" >- xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> >-<description> >- <para>This parameter determines whether or not <citerefentry><refentrytitle>smbclient</refentrytitle> >- <manvolnum>8</manvolnum></citerefentry> and other samba client >- tools will attempt to authenticate itself to servers using the >- weaker LANMAN password hash. If disabled, only server which support NT >- password hashes (e.g. Windows NT/2000, Samba, etc... but not >- Windows 95/98) will be able to be connected from the Samba client.</para> >- >- <para>The LANMAN encrypted response is easily broken, due to it's >- case-insensitive nature, and the choice of algorithm. Clients >- without Windows 95/98 servers are advised to disable >- this option. </para> >- >- <para>Disabling this option will also disable the <command >- moreinfo="none">client plaintext auth</command> option</para> >- >- <para>Likewise, if the <command moreinfo="none">client ntlmv2 >- auth</command> parameter is enabled, then only NTLMv2 logins will be >- attempted.</para> >-</description> >- >-<value type="default">no</value> >-</samba:parameter> >diff -Nru docs-xml.ori/smbdotconf/security/clientsigning.xml docs-xml/smbdotconf/security/clientsigning.xml >--- docs-xml.ori/smbdotconf/security/clientsigning.xml 2009-02-19 20:58:17.550098170 +0100 >+++ docs-xml/smbdotconf/security/clientsigning.xml 2009-02-19 22:30:55.098648386 +0100 >@@ -4,8 +4,7 @@ > basic="1" > xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> > <description> >- <para>This controls whether the client offers or requires >- the server it talks to to use SMB signing. Possible values >+ <para>This controls whether the client is allowed or required to use SMB signing. Possible values > are <emphasis>auto</emphasis>, <emphasis>mandatory</emphasis> > and <emphasis>disabled</emphasis>. > </para> >diff -Nru docs-xml.ori/smbdotconf/security/lanmanauth.xml docs-xml/smbdotconf/security/lanmanauth.xml >--- docs-xml.ori/smbdotconf/security/lanmanauth.xml 2009-02-19 20:59:56.254859911 +0100 >+++ docs-xml/smbdotconf/security/lanmanauth.xml 2009-02-19 20:57:35.522597520 +0100 >@@ -12,7 +12,7 @@ > Windows 95/98 or the MS DOS network client) will be able to > connect to the Samba host.</para> > >- <para>The LANMAN encrypted response is easily broken, due to it's >+ <para>The LANMAN encrypted response is easily broken, due to its > case-insensitive nature, and the choice of algorithm. Servers > without Windows 95/98/ME or MS DOS clients are advised to disable > this option. </para> >diff -Nru docs-xml.ori/smbdotconf/security/lanmanauth.xml~ docs-xml/smbdotconf/security/lanmanauth.xml~ >--- docs-xml.ori/smbdotconf/security/lanmanauth.xml~ 2009-02-19 20:58:17.554717725 +0100 >+++ docs-xml/smbdotconf/security/lanmanauth.xml~ 1970-01-01 01:00:00.000000000 +0100 >@@ -1,33 +0,0 @@ >-<samba:parameter name="lanman auth" >- context="G" >- type="boolean" >- advanced="1" developer="1" >- xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> >-<description> >- <para>This parameter determines whether or not <citerefentry><refentrytitle>smbd</refentrytitle> >- <manvolnum>8</manvolnum></citerefentry> will attempt to >- authenticate users or permit password changes >- using the LANMAN password hash. If disabled, only clients which support NT >- password hashes (e.g. Windows NT/2000 clients, smbclient, but not >- Windows 95/98 or the MS DOS network client) will be able to >- connect to the Samba host.</para> >- >- <para>The LANMAN encrypted response is easily broken, due to it's >- case-insensitive nature, and the choice of algorithm. Servers >- without Windows 95/98/ME or MS DOS clients are advised to disable >- this option. </para> >- >- <para>Unlike the <command moreinfo="none">encrypt >- passwords</command> option, this parameter cannot alter client >- behaviour, and the LANMAN response will still be sent over the >- network. See the <command moreinfo="none">client lanman >- auth</command> to disable this for Samba's clients (such as smbclient)</para> >- >- <para>If this option, and <command moreinfo="none">ntlm >- auth</command> are both disabled, then only NTLMv2 logins will be >- permited. Not all clients support NTLMv2, and most will require >- special configuration to use it.</para> >-</description> >- >-<value type="default">no</value> >-</samba:parameter> >diff -Nru docs-xml.ori/smbdotconf/security/passwordserver.xml docs-xml/smbdotconf/security/passwordserver.xml >--- docs-xml.ori/smbdotconf/security/passwordserver.xml 2009-02-19 20:58:17.485702279 +0100 >+++ docs-xml/smbdotconf/security/passwordserver.xml 2009-02-19 22:17:27.321705642 +0100 >@@ -7,7 +7,7 @@ > <para>By specifying the name of another SMB server > or Active Directory domain controller with this option, > and using <command moreinfo="none">security = [ads|domain|server]</command> >- it is possible to get Samba to >+ it is possible to get Samba > to do all its username/password validation using a specific remote server.</para> > > <para>This option sets the name or IP address of the password server to use. >diff -Nru docs-xml.ori/smbdotconf/security/security.xml docs-xml/smbdotconf/security/security.xml >--- docs-xml.ori/smbdotconf/security/security.xml 2009-02-19 20:58:17.446703535 +0100 >+++ docs-xml/smbdotconf/security/security.xml 2009-02-19 22:23:01.894313691 +0100 >@@ -47,7 +47,7 @@ > want to mainly setup shares without a password (guest shares). This > is commonly used for a shared printer server. It is more difficult > to setup guest shares with <command moreinfo="none">security = user</command>, see >- the <smbconfoption name="map to guest"/>parameter for details.</para> >+ the <smbconfoption name="map to guest"/> parameter for details.</para> > > <para>It is possible to use <command moreinfo="none">smbd</command> in a <emphasis> > hybrid mode</emphasis> where it is offers both user and share >@@ -58,7 +58,7 @@ > > <para><anchor id="SECURITYEQUALSSHARE"/><emphasis>SECURITY = SHARE</emphasis></para> > >- <para>When clients connect to a share level security server they >+ <para>When clients connect to a share level security server, they > need not log onto the server with a valid username and password before > attempting to connect to a shared resource (although modern clients > such as Windows 95/98 and Windows NT will send a logon request with >@@ -211,7 +211,7 @@ > </para></note> > > <note><para>From the client's point of >- view <command moreinfo="none">security = server</command> is the >+ view, <command moreinfo="none">security = server</command> is the > same as <command moreinfo="none">security = user</command>. It > only affects how the server deals with the authentication, it does > not in any way affect what the client sees.</para></note> >diff -Nru docs-xml.ori/smbdotconf/security/serverschannel.xml docs-xml/smbdotconf/security/serverschannel.xml >--- docs-xml.ori/smbdotconf/security/serverschannel.xml 2009-02-19 20:58:17.490788063 +0100 >+++ docs-xml/smbdotconf/security/serverschannel.xml 2009-02-19 22:19:08.150138708 +0100 >@@ -13,7 +13,7 @@ > </para> > > <para> >- Please note that with this set to <literal>no</literal> you will have to apply the WindowsXP >+ Please note that with this set to <literal>no</literal>, you will have to apply the WindowsXP > <filename>WinXP_SignOrSeal.reg</filename> registry patch found in the docs/registry subdirectory of the Samba distribution tarball. > </para> > </description> >diff -Nru docs-xml.ori/smbdotconf/security/serversigning.xml docs-xml/smbdotconf/security/serversigning.xml >--- docs-xml.ori/smbdotconf/security/serversigning.xml 2009-02-19 20:58:17.550098170 +0100 >+++ docs-xml/smbdotconf/security/serversigning.xml 2009-02-19 22:31:22.246625703 +0100 >@@ -5,8 +5,7 @@ > xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> > <description> > >- <para>This controls whether the server offers or requires >- the client it talks to to use SMB signing. Possible values >+ <para>This controls whether the client is allowed or required to use SMB signing. Possible values > are <emphasis>auto</emphasis>, <emphasis>mandatory</emphasis> > and <emphasis>disabled</emphasis>. > </para> >diff -Nru docs-xml.ori/smbdotconf/security/smbencrypt.xml docs-xml/smbdotconf/security/smbencrypt.xml >--- docs-xml.ori/smbdotconf/security/smbencrypt.xml 2009-02-19 20:58:17.490788063 +0100 >+++ docs-xml/smbdotconf/security/smbencrypt.xml 2009-02-19 22:30:07.374896083 +0100 >@@ -16,8 +16,7 @@ > and MacOS/X clients. Windows clients do not support this feature. > </para> > >- <para>This controls whether the server offers or requires >- the client it talks to to use SMB encryption. Possible values >+ <para>This controls whether the remote client is allowed or required to use SMB encryption. Possible values > are <emphasis>auto</emphasis>, <emphasis>mandatory</emphasis> > and <emphasis>disabled</emphasis>. This may be set on a per-share > basis, but clients may chose to encrypt the entire session, not >diff -Nru docs-xml.ori/smbdotconf/security/updateencrypted.xml docs-xml/smbdotconf/security/updateencrypted.xml >--- docs-xml.ori/smbdotconf/security/updateencrypted.xml 2009-02-19 20:58:17.550098170 +0100 >+++ docs-xml/smbdotconf/security/updateencrypted.xml 2009-02-19 21:16:52.466635923 +0100 >@@ -9,7 +9,7 @@ > This boolean parameter allows a user logging on with a plaintext password to have their encrypted (hashed) > password in the smbpasswd file to be updated automatically as they log on. This option allows a site to > migrate from plaintext password authentication (users authenticate with plaintext password over the >- wire, and are checked against a UNIX account atabase) to encrypted password authentication (the SMB >+ wire, and are checked against a UNIX account database) to encrypted password authentication (the SMB > challenge/response authentication mechanism) without forcing all users to re-enter their passwords via > smbpasswd at the time the change is made. This is a convenience option to allow the change over to encrypted > passwords to be made over a longer period. Once all users have encrypted representations of their passwords >@@ -24,7 +24,7 @@ > </para> > > <para> >- Note that even when this parameter is set a user authenticating to <command moreinfo="none">smbd</command> >+ Note that even when this parameter is set, a user authenticating to <command moreinfo="none">smbd</command> > must still enter a valid password in order to connect correctly, and to update their hashed (smbpasswd) > passwords. > </para>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 6127
: 3943 |
3944