The branch, v3-3-test has been updated
       via  b6c900db66481f10d9acbc7fc6a3cbf6b537b486 (commit)
       via  7e3b9564af4ff2a9fa2de6a7ef2dd1ae16bc3d6a (commit)
      from  a4548e41c6f12e4703249c53ad3dc727d2839931 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit b6c900db66481f10d9acbc7fc6a3cbf6b537b486
Author: Karolin Seeger <[email protected]>
Date:   Fri Feb 20 13:32:44 2009 +0100

    s3/docs: Add man vfs_acl_tdb.
    
    Karolin
    (cherry picked from commit 0fd1d4c0906158bab55871d53396bdc7ae533220)

commit 7e3b9564af4ff2a9fa2de6a7ef2dd1ae16bc3d6a
Author: Karolin Seeger <[email protected]>
Date:   Fri Feb 20 13:32:22 2009 +0100

    s3/docs: Add man vfs_acl_xattr.
    
    Karolin
    (cherry picked from commit 3b0114c0ba676dec2ece96983aff29257399f378)

-----------------------------------------------------------------------

Summary of changes:
 .../{vfs_xattr_tdb.8.xml => vfs_acl_tdb.8.xml}     |   45 +++++++++----------
 .../{vfs_xattr_tdb.8.xml => vfs_acl_xattr.8.xml}   |   40 +++++++----------
 2 files changed, 37 insertions(+), 48 deletions(-)
 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} (58%)


Changeset truncated at 500 lines:

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 58%
copy from docs-xml/manpages-3/vfs_xattr_tdb.8.xml
copy to docs-xml/manpages-3/vfs_acl_xattr.8.xml
index de60f3d..b9377b2 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,14 @@
        <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>Please note that this module is
+       <emphasis>experimental</emphasis>!
        </para>
 
        <para>This module is stackable.</para>
@@ -41,19 +44,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 +56,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>


-- 
Samba Shared Repository

Reply via email to