[SCM] Samba Shared Repository - branch v3-3-stable updated -
release-3-3-0-131-g6d3dba3
Karolin Seeger
kseeger at samba.org
Mon Feb 23 08:50:40 GMT 2009
The branch, v3-3-stable has been updated
via 6d3dba353feab40605b25896d48864eb3c0ec096 (commit)
via 56bc6cbd7bb1f342b635eb139f4577dc990e4c1e (commit)
via 45bcc61a38e3dbf75df6decaff9f1cac495420fc (commit)
via efda729240e998155e1ba226f14cb61ff80dcd9d (commit)
via 81c7d422a1c99ad500539b3515a35223d9bf1181 (commit)
via 922f61060c6a90bd197bfadabbf943e19318082b (commit)
via fb89a59aa5f7b5ca5b4f2c8f20b69641c3d5c486 (commit)
via 2dbd2a237362c2dfe2fa8a0717dd672e65a98a4f (commit)
via 57d6805bb18c0fdc05749b8322acce7b8f24dd58 (commit)
via 49b4ec7040babe0b7fc23421874a5b1426c0b93f (commit)
from b93bb7a251cef874eb2d872718f845f00726a8bc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable
- Log -----------------------------------------------------------------
commit 6d3dba353feab40605b25896d48864eb3c0ec096
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Feb 23 09:24:50 2009 +0100
s3/docs: Fix typo in man mount.cifs.
Thanks to Tobias Stoeckmann for reporting!
Karolin
(cherry picked from commit 09a7f93f6be66a8f2a124e49b4effe2b5863f01d)
(cherry picked from commit fdb5c65fc51784b6a159748ec4df3953b7d2c1cb)
commit 56bc6cbd7bb1f342b635eb139f4577dc990e4c1e
Author: Simo Sorce <idra at samba.org>
Date: Sun Feb 22 01:06:28 2009 -0500
For some unknown reason ldbrename was not being built in samba3.
(cherry picked from commit b8fa66be1cbad021143653d4e79f04d79a01bd62)
commit 45bcc61a38e3dbf75df6decaff9f1cac495420fc
Author: Jeremy Allison <jra at samba.org>
Date: Fri Feb 20 16:40:00 2009 -0800
Change smbc_set_credentials_with_fallback() (unreleased) to use
const approptiately.
Jeremy.
(cherry picked from commit 07c7085f25718915cda07e38a87a008a72abbf4f)
commit efda729240e998155e1ba226f14cb61ff80dcd9d
Author: Jeremy Allison <jra at samba.org>
Date: Fri Feb 20 08:22:57 2009 -0800
Fix bug #6133 - Cannot delete non-ACL files on Solaris/ZFS/NFSv4 ACL filesystem.
As the NFSv4 ACL mapping code doesn't map write directory into the DELETE_CHILD
permission bit (which we require before allowing a delete) no one can delete
files without an explicit DELETE_CHILD bit set on the directory. Add this mapping.
Jeremy.
(cherry picked from commit 7df63394aff2a15d96112378a9e3b0acd9edc56a)
commit 81c7d422a1c99ad500539b3515a35223d9bf1181
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date: Fri Feb 20 10:03:55 2009 -0500
variable grouping: just my OCD desire to keep similar things together
(cherry picked from commit f84fd046fcff6c3310ef595fb3e4cbe774703d2a)
commit 922f61060c6a90bd197bfadabbf943e19318082b
Author: Bo Yang <boyang at novell.com>
Date: Fri Feb 20 12:21:52 2009 +0800
Make libsmbclient work with DFS
Signed-off-by: Derrell Lipman <derrell.lipman at unwireduniverse.com>
(cherry picked from commit 8457e7bba4ef2ba479340829bb89a3a8772f958b)
commit fb89a59aa5f7b5ca5b4f2c8f20b69641c3d5c486
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Feb 20 14:14:54 2009 +0100
s3/docs: Add hint about getfattr in man vfs_acl_xattr.
Karolin
(cherry picked from commit 27307be0f726c899c0e8a0edfdf200650037bb61)
(cherry picked from commit 8c978a66168fd22c817e0710d7a70daf7d07b1ab)
commit 2dbd2a237362c2dfe2fa8a0717dd672e65a98a4f
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Feb 20 13:32:44 2009 +0100
s3/docs: Add man vfs_acl_tdb.
Karolin
(cherry picked from commit 0fd1d4c0906158bab55871d53396bdc7ae533220)
(cherry picked from commit b6c900db66481f10d9acbc7fc6a3cbf6b537b486)
commit 57d6805bb18c0fdc05749b8322acce7b8f24dd58
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Feb 20 13:32:22 2009 +0100
s3/docs: Add man vfs_acl_xattr.
Karolin
(cherry picked from commit 3b0114c0ba676dec2ece96983aff29257399f378)
(cherry picked from commit 7e3b9564af4ff2a9fa2de6a7ef2dd1ae16bc3d6a)
commit 49b4ec7040babe0b7fc23421874a5b1426c0b93f
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Feb 20 09:20:16 2009 +0100
s3/docs: Fix several typos.
This fixes bug #6127.
Thanks to Justin T Pryzby <justinpryzby [at] users.sourceforge.net>
for the review!
Karolin
(cherry picked from commit 54dbb030e2c6fed0abd0a3a89d08dad9b8a201a1)
(cherry picked from commit a4548e41c6f12e4703249c53ad3dc727d2839931)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/archives/THANKS | 2 +-
.../man => docs-xml/manpages-3}/ldbrename.1.xml | 0
docs-xml/manpages-3/mount.cifs.8.xml | 2 +-
.../{vfs_xattr_tdb.8.xml => vfs_acl_tdb.8.xml} | 45 ++++++++----------
.../{vfs_xattr_tdb.8.xml => vfs_acl_xattr.8.xml} | 49 ++++++++++----------
docs-xml/smbdotconf/browse/enhancedbrowsing.xml | 2 +-
docs-xml/smbdotconf/locking/strictlocking.xml | 2 +-
docs-xml/smbdotconf/misc/remoteannounce.xml | 4 +-
docs-xml/smbdotconf/misc/usershareallowguests.xml | 2 +-
.../smbdotconf/misc/usershareprefixallowlist.xml | 4 +-
.../smbdotconf/misc/usersharetemplateshare.xml | 2 +-
docs-xml/smbdotconf/printing/useclientdriver.xml | 2 +-
.../smbdotconf/protocol/aclcheckpermissions.xml | 2 +-
docs-xml/smbdotconf/protocol/enableasusupport.xml | 2 +-
docs-xml/smbdotconf/security/clientlanmanauth.xml | 2 +-
docs-xml/smbdotconf/security/clientsigning.xml | 3 +-
docs-xml/smbdotconf/security/lanmanauth.xml | 2 +-
docs-xml/smbdotconf/security/passwordserver.xml | 2 +-
docs-xml/smbdotconf/security/security.xml | 6 +-
docs-xml/smbdotconf/security/serverschannel.xml | 2 +-
docs-xml/smbdotconf/security/serversigning.xml | 3 +-
docs-xml/smbdotconf/security/smbencrypt.xml | 3 +-
docs-xml/smbdotconf/security/updateencrypted.xml | 4 +-
source/Makefile.in | 9 +++-
source/include/libsmbclient.h | 12 +++++
source/libsmb/libsmb_context.c | 46 ++++++++++++++++++
source/libsmb/libsmb_dir.c | 27 ++++++++++-
source/libsmb/libsmb_file.c | 2 +-
source/libsmb/libsmb_path.c | 15 ++++++-
source/libsmb/libsmb_server.c | 19 +++++++-
source/libsmb/libsmb_stat.c | 2 +-
source/modules/nfs4_acls.c | 8 +++-
32 files changed, 203 insertions(+), 84 deletions(-)
copy {source/lib/ldb/man => docs-xml/manpages-3}/ldbrename.1.xml (100%)
copy docs-xml/manpages-3/{vfs_xattr_tdb.8.xml => vfs_acl_tdb.8.xml} (58%)
copy docs-xml/manpages-3/{vfs_xattr_tdb.8.xml => vfs_acl_xattr.8.xml} (52%)
Changeset truncated at 500 lines:
diff --git a/docs-xml/archives/THANKS b/docs-xml/archives/THANKS
index 789042f..37ecc99 100644
--- a/docs-xml/archives/THANKS
+++ b/docs-xml/archives/THANKS
@@ -86,7 +86,7 @@ Tom Haapanen (tomh at metrics.com)
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 --git a/source/lib/ldb/man/ldbrename.1.xml b/docs-xml/manpages-3/ldbrename.1.xml
similarity index 100%
copy from source/lib/ldb/man/ldbrename.1.xml
copy to docs-xml/manpages-3/ldbrename.1.xml
diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml
index 534f168..dae54e1 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -140,7 +140,7 @@ credentials file properly.
same domain (e.g. running winbind or nss_ldap) and
the server supports the Unix Extensions then the uid
and gid can be retrieved from the server (and uid
- and gid would not have to be specifed on the mount.
+ and gid would not have to be specified on the mount.
For servers which do not support the CIFS Unix
extensions, the default uid (and gid) returned on lookup
of existing files will be the uid (gid) of the person
diff --git a/docs-xml/manpages-3/vfs_xattr_tdb.8.xml b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
similarity index 58%
copy from docs-xml/manpages-3/vfs_xattr_tdb.8.xml
copy to docs-xml/manpages-3/vfs_acl_tdb.8.xml
index de60f3d..086b86f 100644
--- a/docs-xml/manpages-3/vfs_xattr_tdb.8.xml
+++ b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<refentry id="vfs_xattr_tdb.8">
+<refentry id="vfs_acl_tdb.8">
<refmeta>
- <refentrytitle>vfs_xattr_tdb</refentrytitle>
+ <refentrytitle>vfs_acl_tdb</refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo class="source">Samba</refmiscinfo>
<refmiscinfo class="manual">System Administration tools</refmiscinfo>
@@ -12,13 +12,13 @@
<refnamediv>
- <refname>vfs_xattr_tdb</refname>
- <refpurpose>Save Extended Attributes (EAs) in a tdb file</refpurpose>
+ <refname>vfs_acl_tdb</refname>
+ <refpurpose>Save NTFS-ACLs in a tdb file</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
- <command>vfs objects = xattr_tdb</command>
+ <command>vfs objects = acl_tdb</command>
</cmdsynopsis>
</refsynopsisdiv>
@@ -29,11 +29,19 @@
<citerefentry><refentrytitle>samba</refentrytitle>
<manvolnum>7</manvolnum></citerefentry> suite.</para>
- <para>The <command>vfs_xattr_tdb</command> VFS module stores
- Extended Attributes (EAs) in a tdb file.
- This enables the usage of Extended Attributes on OS and
- filesystems which do not support Extended Attributes
- by themselves.
+ <para>The <command>vfs_acl_tdb</command> VFS module stores
+ NTFS Access Control Lists (ACLs) in a tdb file.
+ This enables the full mapping of Windows ACLs on Samba
+ servers.
+ </para>
+
+ <para>
+ The ACL settings are stored in
+ <filename>$LOCKDIR/file_ntacls.tdb</filename>.
+ </para>
+
+ <para>Please note that this module is
+ <emphasis>experimental</emphasis>!
</para>
<para>This module is stackable.</para>
@@ -41,19 +49,9 @@
<refsect1>
<title>OPTIONS</title>
-
- <variablelist>
- <varlistentry>
- <term>xattr_tdb:file = PATH</term>
- <listitem>
- <para>Name of the tdb file the EAs are stored in.
- If this option is not set, the default filename
- <filename>xattr.tdb</filename> is used.</para>
- </listitem>
- </varlistentry>
- </variablelist>
-
-
+ <para>
+ There are no options for <command>vfs_acl_tdb</command>.
+ </para>
</refsect1>
<refsect1>
@@ -63,7 +61,6 @@
were created by Andrew Tridgell. Samba is now developed
by the Samba Team as an Open Source project similar
to the way the Linux kernel is developed.</para>
-
</refsect1>
</refentry>
diff --git a/docs-xml/manpages-3/vfs_xattr_tdb.8.xml b/docs-xml/manpages-3/vfs_acl_xattr.8.xml
similarity index 52%
copy from docs-xml/manpages-3/vfs_xattr_tdb.8.xml
copy to docs-xml/manpages-3/vfs_acl_xattr.8.xml
index de60f3d..7387824 100644
--- a/docs-xml/manpages-3/vfs_xattr_tdb.8.xml
+++ b/docs-xml/manpages-3/vfs_acl_xattr.8.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<refentry id="vfs_xattr_tdb.8">
+<refentry id="vfs_acl_xattr.8">
<refmeta>
- <refentrytitle>vfs_xattr_tdb</refentrytitle>
+ <refentrytitle>vfs_acl_xattr</refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo class="source">Samba</refmiscinfo>
<refmiscinfo class="manual">System Administration tools</refmiscinfo>
@@ -12,13 +12,13 @@
<refnamediv>
- <refname>vfs_xattr_tdb</refname>
- <refpurpose>Save Extended Attributes (EAs) in a tdb file</refpurpose>
+ <refname>vfs_acl_xattr</refname>
+ <refpurpose>Save NTFS-ACLs in Extended Attributes (EAs)</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
- <command>vfs objects = xattr_tdb</command>
+ <command>vfs objects = acl_xattr</command>
</cmdsynopsis>
</refsynopsisdiv>
@@ -29,11 +29,23 @@
<citerefentry><refentrytitle>samba</refentrytitle>
<manvolnum>7</manvolnum></citerefentry> suite.</para>
- <para>The <command>vfs_xattr_tdb</command> VFS module stores
- Extended Attributes (EAs) in a tdb file.
- This enables the usage of Extended Attributes on OS and
- filesystems which do not support Extended Attributes
- by themselves.
+ <para>The <command>vfs_acl_xattr</command> VFS module stores
+ NTFS Access Control Lists (ACLs) in Extended Attributes (EAs).
+ This enables the full mapping of Windows ACLs on Samba
+ servers.
+ </para>
+
+ <para>The ACLs are stored in the Extended Attribute
+ <parameter>security.NTACL</parameter> of a file or directory.
+ This Attribute is <emphasis>not</emphasis> listed by
+ <command>getfattr -d <filename>filename</filename></command>.
+ To show the current value, the name of the EA must be specified
+ (e.g. <command>getfattr -n security.NTACL <filename>filename</filename>
+ </command>).
+ </para>
+
+ <para>Please note that this module is
+ <emphasis>experimental</emphasis>!
</para>
<para>This module is stackable.</para>
@@ -41,19 +53,9 @@
<refsect1>
<title>OPTIONS</title>
-
- <variablelist>
- <varlistentry>
- <term>xattr_tdb:file = PATH</term>
- <listitem>
- <para>Name of the tdb file the EAs are stored in.
- If this option is not set, the default filename
- <filename>xattr.tdb</filename> is used.</para>
- </listitem>
- </varlistentry>
- </variablelist>
-
-
+ <para>
+ There are no options for <command>vfs_acl_xattr</command>.
+ </para>
</refsect1>
<refsect1>
@@ -63,7 +65,6 @@
were created by Andrew Tridgell. Samba is now developed
by the Samba Team as an Open Source project similar
to the way the Linux kernel is developed.</para>
-
</refsect1>
</refentry>
diff --git a/docs-xml/smbdotconf/browse/enhancedbrowsing.xml b/docs-xml/smbdotconf/browse/enhancedbrowsing.xml
index 13f2cd6..7f85616 100644
--- a/docs-xml/smbdotconf/browse/enhancedbrowsing.xml
+++ b/docs-xml/smbdotconf/browse/enhancedbrowsing.xml
@@ -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 --git a/docs-xml/smbdotconf/locking/strictlocking.xml b/docs-xml/smbdotconf/locking/strictlocking.xml
index e3a0ed7..15ad0ad 100644
--- a/docs-xml/smbdotconf/locking/strictlocking.xml
+++ b/docs-xml/smbdotconf/locking/strictlocking.xml
@@ -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 --git a/docs-xml/smbdotconf/misc/remoteannounce.xml b/docs-xml/smbdotconf/misc/remoteannounce.xml
index f23968b..a6bf0c5 100644
--- a/docs-xml/smbdotconf/misc/remoteannounce.xml
+++ b/docs-xml/smbdotconf/misc/remoteannounce.xml
@@ -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 --git a/docs-xml/smbdotconf/misc/usershareallowguests.xml b/docs-xml/smbdotconf/misc/usershareallowguests.xml
index 738f3a1..a3ae518 100644
--- a/docs-xml/smbdotconf/misc/usershareallowguests.xml
+++ b/docs-xml/smbdotconf/misc/usershareallowguests.xml
@@ -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 --git a/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml b/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
index bacc2e9..6c1822a 100644
--- a/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
+++ b/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
@@ -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 --git a/docs-xml/smbdotconf/misc/usersharetemplateshare.xml b/docs-xml/smbdotconf/misc/usersharetemplateshare.xml
index efe2e81..9593a6c 100644
--- a/docs-xml/smbdotconf/misc/usersharetemplateshare.xml
+++ b/docs-xml/smbdotconf/misc/usersharetemplateshare.xml
@@ -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 --git a/docs-xml/smbdotconf/printing/useclientdriver.xml b/docs-xml/smbdotconf/printing/useclientdriver.xml
index 99e8556..4d9b7ab 100644
--- a/docs-xml/smbdotconf/printing/useclientdriver.xml
+++ b/docs-xml/smbdotconf/printing/useclientdriver.xml
@@ -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 --git a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
index 6916261..79b6da7 100644
--- a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
+++ b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
@@ -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 --git a/docs-xml/smbdotconf/protocol/enableasusupport.xml b/docs-xml/smbdotconf/protocol/enableasusupport.xml
index cd4f30f..bb56b5a 100644
--- a/docs-xml/smbdotconf/protocol/enableasusupport.xml
+++ b/docs-xml/smbdotconf/protocol/enableasusupport.xml
@@ -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 --git a/docs-xml/smbdotconf/security/clientlanmanauth.xml b/docs-xml/smbdotconf/security/clientlanmanauth.xml
index 5266fef..967eacf 100644
--- a/docs-xml/smbdotconf/security/clientlanmanauth.xml
+++ b/docs-xml/smbdotconf/security/clientlanmanauth.xml
@@ -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 --git a/docs-xml/smbdotconf/security/clientsigning.xml b/docs-xml/smbdotconf/security/clientsigning.xml
index bf37cbb..c657e05 100644
--- a/docs-xml/smbdotconf/security/clientsigning.xml
+++ b/docs-xml/smbdotconf/security/clientsigning.xml
@@ -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 --git a/docs-xml/smbdotconf/security/lanmanauth.xml b/docs-xml/smbdotconf/security/lanmanauth.xml
index 3419522..4e68c5e 100644
--- a/docs-xml/smbdotconf/security/lanmanauth.xml
+++ b/docs-xml/smbdotconf/security/lanmanauth.xml
@@ -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 --git a/docs-xml/smbdotconf/security/passwordserver.xml b/docs-xml/smbdotconf/security/passwordserver.xml
index 0da247d..0e92af9 100644
--- a/docs-xml/smbdotconf/security/passwordserver.xml
+++ b/docs-xml/smbdotconf/security/passwordserver.xml
@@ -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 --git a/docs-xml/smbdotconf/security/security.xml b/docs-xml/smbdotconf/security/security.xml
index 3ad5175..514ea54 100644
--- a/docs-xml/smbdotconf/security/security.xml
+++ b/docs-xml/smbdotconf/security/security.xml
@@ -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 --git a/docs-xml/smbdotconf/security/serverschannel.xml b/docs-xml/smbdotconf/security/serverschannel.xml
index 6317448..6554635 100644
--- a/docs-xml/smbdotconf/security/serverschannel.xml
+++ b/docs-xml/smbdotconf/security/serverschannel.xml
@@ -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 --git a/docs-xml/smbdotconf/security/serversigning.xml b/docs-xml/smbdotconf/security/serversigning.xml
index f2f5629..ea21a2c 100644
--- a/docs-xml/smbdotconf/security/serversigning.xml
+++ b/docs-xml/smbdotconf/security/serversigning.xml
@@ -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 --git a/docs-xml/smbdotconf/security/smbencrypt.xml b/docs-xml/smbdotconf/security/smbencrypt.xml
index eb91ce5..d556166 100644
--- a/docs-xml/smbdotconf/security/smbencrypt.xml
+++ b/docs-xml/smbdotconf/security/smbencrypt.xml
@@ -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 --git a/docs-xml/smbdotconf/security/updateencrypted.xml b/docs-xml/smbdotconf/security/updateencrypted.xml
index da49366..eb54ed9 100644
--- a/docs-xml/smbdotconf/security/updateencrypted.xml
+++ b/docs-xml/smbdotconf/security/updateencrypted.xml
@@ -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>
diff --git a/source/Makefile.in b/source/Makefile.in
index a77ec48..f7b4431 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -194,7 +194,7 @@ BIN_PROGS3 = bin/smbpasswd at EXEEXT@ bin/rpcclient at EXEEXT@ bin/smbcacls at EXEEXT@ \
bin/profiles at EXEEXT@ bin/ntlm_auth at EXEEXT@ bin/sharesec at EXEEXT@ \
bin/smbcquotas at EXEEXT@ bin/eventlogadm at EXEEXT@
--
Samba Shared Repository
More information about the samba-cvs
mailing list