The Samba-Bugzilla – Attachment 13405 Details for
Bug 12918
Unadequate format in programlisting
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Unadequate format in programlisting
manpages-unadequate-in-programlisting.diff (text/plain), 56.11 KB, created by
Michio MATSUYAMA
on 2017-07-20 06:54:09 UTC
(
hide
)
Description:
Unadequate format in programlisting
Filename:
MIME Type:
Creator:
Michio MATSUYAMA
Created:
2017-07-20 06:54:09 UTC
Size:
56.11 KB
patch
obsolete
>diff --git a/docs-xml/manpages/eventlogadm.8.xml b/docs-xml/manpages/eventlogadm.8.xml >index 3c12b26..1584d17 100644 >--- a/docs-xml/manpages/eventlogadm.8.xml >+++ b/docs-xml/manpages/eventlogadm.8.xml >@@ -242,35 +242,32 @@ > <para>An example of the record format accepted by <command>eventlogadm</command>:</para> > > <programlisting> >- LEN: 0 >- RS1: 1699505740 >- RCN: 0 >- TMG: 1128631322 >- TMW: 1128631322 >- EID: 1000 >- ETP: INFO >- ECT: 0 >- RS2: 0 >- CRN: 0 >- USL: 0 >- SRC: cron >- SRN: dmlinux >- STR: (root) CMD ( rm -f /var/spool/cron/lastrun/cron.hourly) >- DAT: >- </programlisting> >+LEN: 0 >+RS1: 1699505740 >+RCN: 0 >+TMG: 1128631322 >+TMW: 1128631322 >+EID: 1000 >+ETP: INFO >+ECT: 0 >+RS2: 0 >+CRN: 0 >+USL: 0 >+SRC: cron >+SRN: dmlinux >+STR: (root) CMD ( rm -f /var/spool/cron/lastrun/cron.hourly) >+DAT:</programlisting> > > <para>Set up an eventlog source, specifying a message file DLL:</para> > <programlisting> >- eventlogadm -o addsource Application MyApplication | \\ >- %SystemRoot%/system32/MyApplication.dll >- </programlisting> >+eventlogadm -o addsource Application MyApplication | \\ >+ %SystemRoot%/system32/MyApplication.dll</programlisting> > > <para>Filter messages from the system log into an event log:</para> > <programlisting> >- tail -f /var/log/messages | \\ >- my_program_to_parse_into_eventlog_records | \\ >- eventlogadm SystemLogEvents >- </programlisting> >+tail -f /var/log/messages | \\ >+ my_program_to_parse_into_eventlog_records | \\ >+ eventlogadm SystemLogEvents</programlisting> > > </refsect1> > >diff --git a/docs-xml/manpages/idmap_ad.8.xml b/docs-xml/manpages/idmap_ad.8.xml >index fa5ae72..8bd2a6e 100644 >--- a/docs-xml/manpages/idmap_ad.8.xml >+++ b/docs-xml/manpages/idmap_ad.8.xml >@@ -115,15 +115,14 @@ > </para> > > <programlisting> >- [global] >- workgroup = CORP >+[global] >+workgroup = CORP > >- idmap config * : backend = tdb >- idmap config * : range = 1000000-1999999 >+idmap config * : backend = tdb >+idmap config * : range = 1000000-1999999 > >- idmap config CORP : backend = ad >- idmap config CORP : range = 1000-999999 >- </programlisting> >+idmap config CORP : backend = ad >+idmap config CORP : range = 1000-999999</programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/idmap_autorid.8.xml b/docs-xml/manpages/idmap_autorid.8.xml >index 32d53b4..f427b78 100644 >--- a/docs-xml/manpages/idmap_autorid.8.xml >+++ b/docs-xml/manpages/idmap_autorid.8.xml >@@ -103,8 +103,7 @@ > <para> > The Unix ID for a RID is calculated this way: > <programlisting> >- ID = REDUCED RID + IDMAP RANGE LOW VALUE + RANGE NUMBER * RANGE SIZE >- </programlisting> >+ID = REDUCED RID + IDMAP RANGE LOW VALUE + RANGE NUMBER * RANGE SIZE</programlisting> > where REDUCED RID = RID % RANGE_SIZE > and a DOMAIN RANGE INDEX = RID / RANGE_SIZE is used together with the > domain sid to determine the RANGE NUMBER (stored in the database). >@@ -113,8 +112,7 @@ > Correspondingly, the formula for calculating the RID for a > given Unix ID is this: > <programlisting> >- RID = (ID - LOW ID) % RANGE SIZE + DOMAIN RANGE INDEX * RANGE SIZE >- </programlisting> >+RID = (ID - LOW ID) % RANGE SIZE + DOMAIN RANGE INDEX * RANGE SIZE</programlisting> > Where the DOMAIN RANGE INDEX is retrieved from the database along with the > domain sid by the RANGE NUMBER = (ID - LOW ID) / RANGE SIZE . > </para> >@@ -129,15 +127,13 @@ > </para> > > <programlisting> >- [global] >- security = ads >- workgroup = CUSTOMER >- realm = CUSTOMER.COM >+[global] >+security = ads >+workgroup = CUSTOMER >+realm = CUSTOMER.COM > >- idmap config * : backend = autorid >- idmap config * : range = 1000000-1999999 >- >- </programlisting> >+idmap config * : backend = autorid >+idmap config * : range = 1000000-1999999</programlisting> > > <para> > This example shows how to configure idmap_autorid as default >diff --git a/docs-xml/manpages/idmap_hash.8.xml b/docs-xml/manpages/idmap_hash.8.xml >index 311319d..117c780 100644 >--- a/docs-xml/manpages/idmap_hash.8.xml >+++ b/docs-xml/manpages/idmap_hash.8.xml >@@ -69,14 +69,13 @@ > </para> > > <programlisting> >- [global] >- idmap config * : backend = hash >- idmap config * : range = 1000-2147483647 >- >- winbind nss info = hash >- winbind normalize names = yes >- idmap_hash:name_map = /etc/samba/name_map.cfg >- </programlisting> >+[global] >+idmap config * : backend = hash >+idmap config * : range = 1000-2147483647 >+ >+winbind nss info = hash >+winbind normalize names = yes >+idmap_hash:name_map = /etc/samba/name_map.cfg</programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/idmap_ldap.8.xml b/docs-xml/manpages/idmap_ldap.8.xml >index 872bb6d..fe51aed 100644 >--- a/docs-xml/manpages/idmap_ldap.8.xml >+++ b/docs-xml/manpages/idmap_ldap.8.xml >@@ -89,13 +89,12 @@ > </para> > > <programlisting> >- [global] >- idmap config * : backend = ldap >- idmap config * : range = 1000000-1999999 >- idmap config * : ldap_url = ldap://localhost/ >- idmap config * : ldap_base_dn = ou=idmap,dc=example,dc=com >- idmap config * : ldap_user_dn = cn=idmap_admin,dc=example,dc=com >- </programlisting> >+[global] >+idmap config * : backend = ldap >+idmap config * : range = 1000000-1999999 >+idmap config * : ldap_url = ldap://localhost/ >+idmap config * : ldap_base_dn = ou=idmap,dc=example,dc=com >+idmap config * : ldap_user_dn = cn=idmap_admin,dc=example,dc=com</programlisting> > > <para> > This example shows how ldap can be used as a readonly backend while >@@ -106,18 +105,17 @@ > </para> > > <programlisting> >- [global] >- # "backend = tdb" is redundant here since it is the default >- idmap config * : backend = tdb >- idmap config * : range = 1000000-1999999 >- >- idmap config DOM1 : backend = ldap >- idmap config DOM1 : range = 2000000-2999999 >- idmap config DOM1 : read only = yes >- idmap config DOM1 : ldap_url = ldap://server/ >- idmap config DOM1 : ldap_base_dn = ou=idmap,dc=dom1,dc=example,dc=com >- idmap config DOM1 : ldap_user_dn = cn=idmap_admin,dc=dom1,dc=example,dc=com >- </programlisting> >+[global] >+# "backend = tdb" is redundant here since it is the default >+idmap config * : backend = tdb >+idmap config * : range = 1000000-1999999 >+ >+idmap config DOM1 : backend = ldap >+idmap config DOM1 : range = 2000000-2999999 >+idmap config DOM1 : read only = yes >+idmap config DOM1 : ldap_url = ldap://server/ >+idmap config DOM1 : ldap_base_dn = ou=idmap,dc=dom1,dc=example,dc=com >+idmap config DOM1 : ldap_user_dn = cn=idmap_admin,dc=dom1,dc=example,dc=com</programlisting> > </refsect1> > > <refsynopsisdiv> >diff --git a/docs-xml/manpages/idmap_nss.8.xml b/docs-xml/manpages/idmap_nss.8.xml >index 303a0f4..128bec0 100644 >--- a/docs-xml/manpages/idmap_nss.8.xml >+++ b/docs-xml/manpages/idmap_nss.8.xml >@@ -37,13 +37,12 @@ > </para> > > <programlisting> >- [global] >- idmap config * : backend = tdb >- idmap config * : range = 1000000-1999999 >+[global] >+idmap config * : backend = tdb >+idmap config * : range = 1000000-1999999 > >- idmap config SAMBA : backend = nss >- idmap config SAMBA : range = 1000-999999 >- </programlisting> >+idmap config SAMBA : backend = nss >+idmap config SAMBA : range = 1000-999999</programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/idmap_rfc2307.8.xml b/docs-xml/manpages/idmap_rfc2307.8.xml >index 5785662..963932c 100644 >--- a/docs-xml/manpages/idmap_rfc2307.8.xml >+++ b/docs-xml/manpages/idmap_rfc2307.8.xml >@@ -136,18 +136,17 @@ > that may be used in internal backends like BUILTIN.</para> > > <programlisting> >- [global] >- idmap config * : backend = tdb >- idmap config * : range = 1000000-1999999 >- >- idmap config DOMAIN : backend = rfc2307 >- idmap config DOMAIN : range = 2000000-2999999 >- idmap config DOMAIN : ldap_server = stand-alone >- idmap config DOMAIN : ldap_url = ldap://ldap1.example.com >- idmap config DOMAIN : ldap_user_dn = cn=ldapmanager,dc=example,dc=com >- idmap config DOMAIN : bind_path_user = ou=People,dc=example,dc=com >- idmap config DOMAIN : bind_path_group = ou=Group,dc=example,dc=com >- </programlisting> >+[global] >+idmap config * : backend = tdb >+idmap config * : range = 1000000-1999999 >+ >+idmap config DOMAIN : backend = rfc2307 >+idmap config DOMAIN : range = 2000000-2999999 >+idmap config DOMAIN : ldap_server = stand-alone >+idmap config DOMAIN : ldap_url = ldap://ldap1.example.com >+idmap config DOMAIN : ldap_user_dn = cn=ldapmanager,dc=example,dc=com >+idmap config DOMAIN : bind_path_user = ou=People,dc=example,dc=com >+idmap config DOMAIN : bind_path_group = ou=Group,dc=example,dc=com</programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/idmap_rid.8.xml b/docs-xml/manpages/idmap_rid.8.xml >index 19d89ef..11d863e 100644 >--- a/docs-xml/manpages/idmap_rid.8.xml >+++ b/docs-xml/manpages/idmap_rid.8.xml >@@ -74,15 +74,13 @@ > <para> > The Unix ID for a RID is calculated this way: > <programlisting> >- ID = RID - BASE_RID + LOW_RANGE_ID. >- </programlisting> >+ID = RID - BASE_RID + LOW_RANGE_ID</programlisting> > </para> > <para> > Correspondingly, the formula for calculating the RID for a > given Unix ID is this: > <programlisting> >- RID = ID + BASE_RID - LOW_RANGE_ID. >- </programlisting> >+RID = ID + BASE_RID - LOW_RANGE_ID</programlisting> > </para> > </refsect1> > >@@ -96,19 +94,18 @@ > </para> > > <programlisting> >- [global] >- security = domain >- workgroup = MAIN >+[global] >+security = domain >+workgroup = MAIN > >- idmap config * : backend = tdb >- idmap config * : range = 1000000-1999999 >+idmap config * : backend = tdb >+idmap config * : range = 1000000-1999999 > >- idmap config MAIN : backend = rid >- idmap config MAIN : range = 10000 - 49999 >+idmap config MAIN : backend = rid >+idmap config MAIN : range = 10000 - 49999 > >- idmap config TRUSTED : backend = rid >- idmap config TRUSTED : range = 50000 - 99999 >- </programlisting> >+idmap config TRUSTED : backend = rid >+idmap config TRUSTED : range = 50000 - 99999</programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/idmap_script.8.xml b/docs-xml/manpages/idmap_script.8.xml >index d115486..9bd0704 100644 >--- a/docs-xml/manpages/idmap_script.8.xml >+++ b/docs-xml/manpages/idmap_script.8.xml >@@ -78,11 +78,10 @@ > </para> > > <programlisting> >- SIDTOID S-1-xxxx >- IDTOSID UID xxxx >- IDTOSID GID xxxx >- IDTOSID XID xxxx >- </programlisting> >+SIDTOID S-1-xxxx >+IDTOSID UID xxxx >+IDTOSID GID xxxx >+IDTOSID XID xxxx</programlisting> > > <para> > And it should return one of the following responses as a single line of >@@ -90,12 +89,11 @@ > </para> > > <programlisting> >- UID:yyyy >- GID:yyyy >- XID:yyyy >- SID:ssss >- ERR:yyyy >- </programlisting> >+UID:yyyy >+GID:yyyy >+XID:yyyy >+SID:ssss >+ERR:yyyy</programlisting> > > <para> > XID indicates that the ID returned should be both a UID and a GID. >@@ -114,33 +112,31 @@ > </para> > > <programlisting> >- [global] >- idmap config * : backend = script >- idmap config * : range = 1000000-2000000 >- idmap config * : script = /usr/local/samba/bin/idmap_script.sh >- </programlisting> >+[global] >+idmap config * : backend = script >+idmap config * : range = 1000000-2000000 >+idmap config * : script = /usr/local/samba/bin/idmap_script.sh</programlisting> > > <para> > This shows a simple script to partially perform the task: > </para> > > <programlisting> >- #!/bin/sh >- # >- # Uncomment this if you want some logging >- #echo $@ >> /tmp/idmap.sh.log >- if [ "$1" == "SIDTOID" ] >- then >- # Note. The number returned has to be within the range defined >- #echo "Sending UID:1000005" >> /tmp/idmap.sh.log >- echo "UID:1000005" >- exit 0 >- else >- #echo "Sending ERR: No idea what to do" >> /tmp/idmap.sh.log >- echo "ERR: No idea what to do" >- exit 1 >- fi >- </programlisting> >+#!/bin/sh >+# >+# Uncomment this if you want some logging >+#echo $@ >> /tmp/idmap.sh.log >+if [ "$1" == "SIDTOID" ] >+then >+ # Note. The number returned has to be within the range defined >+ #echo "Sending UID:1000005" >> /tmp/idmap.sh.log >+ echo "UID:1000005" >+ exit 0 >+else >+ #echo "Sending ERR: No idea what to do" >> /tmp/idmap.sh.log >+ echo "ERR: No idea what to do" >+ exit 1 >+fi</programlisting> > > <para> > Clearly, this script is not enough, as it should probably use wbinfo >diff --git a/docs-xml/manpages/idmap_tdb.8.xml b/docs-xml/manpages/idmap_tdb.8.xml >index 04f38305..f5ea5b9 100644 >--- a/docs-xml/manpages/idmap_tdb.8.xml >+++ b/docs-xml/manpages/idmap_tdb.8.xml >@@ -54,11 +54,10 @@ > </para> > > <programlisting> >- [global] >- # "backend = tdb" is redundant here since it is the default >- idmap config * : backend = tdb >- idmap config * : range = 1000000-2000000 >- </programlisting> >+[global] >+# "backend = tdb" is redundant here since it is the default >+idmap config * : backend = tdb >+idmap config * : range = 1000000-2000000</programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/idmap_tdb2.8.xml b/docs-xml/manpages/idmap_tdb2.8.xml >index 5b4fe2e..4f93f7b 100644 >--- a/docs-xml/manpages/idmap_tdb2.8.xml >+++ b/docs-xml/manpages/idmap_tdb2.8.xml >@@ -79,10 +79,9 @@ > </para> > > <programlisting> >- SIDTOID S-1-xxxx >- IDTOSID UID xxxx >- IDTOSID GID xxxx >- </programlisting> >+SIDTOID S-1-xxxx >+IDTOSID UID xxxx >+IDTOSID GID xxxx</programlisting> > > <para> > And it should return one of the following responses as a single line of >@@ -90,11 +89,10 @@ > </para> > > <programlisting> >- UID:yyyy >- GID:yyyy >- SID:yyyy >- ERR:yyyy >- </programlisting> >+UID:yyyy >+GID:yyyy >+SID:yyyy >+ERR:yyyy</programlisting> > </refsect1> > > <refsect1> >@@ -105,10 +103,9 @@ > </para> > > <programlisting> >- [global] >- idmap config * : backend = tdb2 >- idmap config * : range = 1000000-2000000 >- </programlisting> >+[global] >+idmap config * : backend = tdb2 >+idmap config * : range = 1000000-2000000</programlisting> > > <para> > This example shows how tdb2 is used as a the default idmap backend >@@ -116,11 +113,10 @@ > </para> > > <programlisting> >- [global] >- idmap config * : backend = tdb2 >- idmap config * : range = 1000000-2000000 >- idmap config * : script = /usr/local/samba/bin/idmap_script.sh >- </programlisting> >+[global] >+idmap config * : backend = tdb2 >+idmap config * : range = 1000000-2000000 >+idmap config * : script = /usr/local/samba/bin/idmap_script.sh</programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/log2pcap.1.xml b/docs-xml/manpages/log2pcap.1.xml >index 40f6e92..2b9ed07 100644 >--- a/docs-xml/manpages/log2pcap.1.xml >+++ b/docs-xml/manpages/log2pcap.1.xml >@@ -90,14 +90,12 @@ > <para>Extract all network traffic from all samba log files:</para> > > <para><programlisting> >- <prompt>$</prompt> log2pcap < /var/log/* > trace.pcap >- </programlisting></para> >+<prompt>$</prompt> log2pcap < /var/log/* > trace.pcap</programlisting></para> > > <para>Convert to pcap using text2pcap:</para> > > <para><programlisting> >- <prompt>$</prompt> log2pcap -h samba.log | text2pcap -T 139,139 - trace.pcap >- </programlisting></para> >+<prompt>$</prompt> log2pcap -h samba.log | text2pcap -T 139,139 - trace.pcap</programlisting></para> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/pam_winbind.8.xml b/docs-xml/manpages/pam_winbind.8.xml >index c8f3250..e78087d 100644 >--- a/docs-xml/manpages/pam_winbind.8.xml >+++ b/docs-xml/manpages/pam_winbind.8.xml >@@ -34,19 +34,18 @@ > <para> > Edit the PAM system config /etc/pam.d/service and modify it as the following example shows: > <programlisting> >- ... >- auth required pam_env.so >- auth sufficient pam_unix2.so >- +++ auth required pam_winbind.so use_first_pass >- account requisite pam_unix2.so >- +++ account required pam_winbind.so use_first_pass >- +++ password sufficient pam_winbind.so >- password requisite pam_pwcheck.so cracklib >- password required pam_unix2.so use_authtok >- session required pam_unix2.so >- +++ session required pam_winbind.so >- ... >- </programlisting> >+ ... >+ auth required pam_env.so >+ auth sufficient pam_unix2.so >++++ auth required pam_winbind.so use_first_pass >+ account requisite pam_unix2.so >++++ account required pam_winbind.so use_first_pass >++++ password sufficient pam_winbind.so >+ password requisite pam_pwcheck.so cracklib >+ password required pam_unix2.so use_authtok >+ session required pam_unix2.so >++++ session required pam_winbind.so >+ ...</programlisting> > > Make sure that pam_winbind is one of the first modules in the session part. It may retrieve > kerberos tickets which are needed by other modules. >diff --git a/docs-xml/manpages/sharesec.1.xml b/docs-xml/manpages/sharesec.1.xml >index d0ae9e9..eaf3661 100644 >--- a/docs-xml/manpages/sharesec.1.xml >+++ b/docs-xml/manpages/sharesec.1.xml >@@ -143,11 +143,10 @@ > either commas or newlines. An ACL entry is one of the following: </para> > > <para><programlisting> >- REVISION:<revision number> >- OWNER:<sid or name> >- GROUP:<sid or name> >- ACL:<sid or name>:<type>/<flags>/<mask> >- </programlisting></para> >+REVISION:<revision number> >+OWNER:<sid or name> >+GROUP:<sid or name> >+ACL:<sid or name>:<type>/<flags>/<mask></programlisting></para> > > <para>The revision of the ACL specifies the internal Windows > NT ACL revision for the security descriptor. >@@ -217,21 +216,19 @@ > </para> > > <programlisting> >- host:~ # sharesec share -a S-1-5-21-1866488690-1365729215-3963860297-17724:ALLOWED/0/FULL >- </programlisting> >+host:~ # sharesec share -a S-1-5-21-1866488690-1365729215-3963860297-17724:ALLOWED/0/FULL</programlisting> > > <para>List all ACEs for <parameter>share</parameter>: > </para> > > <programlisting> >- host:~ # sharesec share -v >- REVISION:1 >- CONTROL:SR|DP >- OWNER: >- GROUP: >- ACL:S-1-1-0:ALLOWED/0x0/FULL >- ACL:S-1-5-21-1866488690-1365729215-3963860297-17724:ALLOWED/0x0/FULL >- </programlisting> >+host:~ # sharesec share -v >+REVISION:1 >+CONTROL:SR|DP >+OWNER: >+GROUP: >+ACL:S-1-1-0:ALLOWED/0x0/FULL >+ACL:S-1-5-21-1866488690-1365729215-3963860297-17724:ALLOWED/0x0/FULL</programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml >index 4992813..0a37b93 100644 >--- a/docs-xml/manpages/smb.conf.5.xml >+++ b/docs-xml/manpages/smb.conf.5.xml >@@ -113,9 +113,9 @@ > The following sample section defines a file space share. The user has write access to the path <filename > moreinfo="none">/home/bar</filename>. The share is accessed via the share name <literal>foo</literal>: > <programlisting> >- <smbconfsection name="[foo]"/> >- <smbconfoption name="path">/home/bar</smbconfoption> >- <smbconfoption name="read only">no</smbconfoption> >+<smbconfsection name="[foo]"/> >+<smbconfoption name="path">/home/bar</smbconfoption> >+<smbconfoption name="read only">no</smbconfoption> > </programlisting> > </para> > >@@ -124,11 +124,11 @@ > the only write access permitted is via calls to open, write to and close a spool file. The <emphasis>guest > ok</emphasis> parameter means access will be permitted as the default guest user (specified elsewhere): > <programlisting> >- <smbconfsection name="[aprinter]"/> >- <smbconfoption name="path">/usr/spool/public</smbconfoption> >- <smbconfoption name="read only">yes</smbconfoption> >- <smbconfoption name="printable">yes</smbconfoption> >- <smbconfoption name="guest ok">yes</smbconfoption> >+<smbconfsection name="[aprinter]"/> >+<smbconfoption name="path">/usr/spool/public</smbconfoption> >+<smbconfoption name="read only">yes</smbconfoption> >+<smbconfoption name="printable">yes</smbconfoption> >+<smbconfoption name="guest ok">yes</smbconfoption> > </programlisting> > </para> > >@@ -358,8 +358,8 @@ chmod 1770 /usr/local/samba/lib/usershares > <para>Then add the parameters > > <programlisting> >- <smbconfoption name="usershare path">/usr/local/samba/lib/usershares</smbconfoption> >- <smbconfoption name="usershare max shares">10</smbconfoption> # (or the desired number of shares) >+<smbconfoption name="usershare path">/usr/local/samba/lib/usershares</smbconfoption> >+<smbconfoption name="usershare max shares">10</smbconfoption> # (or the desired number of shares) > </programlisting> > > to the global >@@ -799,19 +799,18 @@ chmod 1770 /usr/local/samba/lib/usershares > </para> > > <programlisting> >- [global] >- security = domain >- workgroup = MAIN >+[global] >+security = domain >+workgroup = MAIN > >- idmap config * : backend = tdb >- idmap config * : range = 1000000-1999999 >+idmap config * : backend = tdb >+idmap config * : range = 1000000-1999999 > >- idmap config MAIN : backend = rid >- idmap config MAIN : range = 5000000-5999999 >+idmap config MAIN : backend = rid >+idmap config MAIN : range = 5000000-5999999 > >- idmap config TRUSTED : backend = rid >- idmap config TRUSTED : range = 6000000-6999999 >- </programlisting> >+idmap config TRUSTED : backend = rid >+idmap config TRUSTED : range = 6000000-6999999</programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml >index cb198a7..78f6f7d 100644 >--- a/docs-xml/manpages/smbcacls.1.xml >+++ b/docs-xml/manpages/smbcacls.1.xml >@@ -204,7 +204,7 @@ > <para>The format of an ACL is one or more entries separated by > either commas or newlines. An ACL entry is one of the following: </para> > >-<para><programlisting> >+<para><programlisting> > REVISION:<revision number> > OWNER:<sid or name> > GROUP:<sid or name> >diff --git a/docs-xml/manpages/vfs_aio_fork.8.xml b/docs-xml/manpages/vfs_aio_fork.8.xml >index bb81c64..30ddcc0 100644 >--- a/docs-xml/manpages/vfs_aio_fork.8.xml >+++ b/docs-xml/manpages/vfs_aio_fork.8.xml >@@ -59,9 +59,9 @@ > <para>Straight forward use:</para> > > <programlisting> >- <smbconfsection name="[cooldata]"/> >- <smbconfoption name="path">/data/ice</smbconfoption> >- <smbconfoption name="vfs objects">aio_fork</smbconfoption> >+<smbconfsection name="[cooldata]"/> >+<smbconfoption name="path">/data/ice</smbconfoption> >+<smbconfoption name="vfs objects">aio_fork</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_aio_linux.8.xml b/docs-xml/manpages/vfs_aio_linux.8.xml >index 3a00950..e0326da 100644 >--- a/docs-xml/manpages/vfs_aio_linux.8.xml >+++ b/docs-xml/manpages/vfs_aio_linux.8.xml >@@ -69,11 +69,11 @@ > <para>Straight forward use:</para> > > <programlisting> >- <smbconfsection name="[cooldata]"/> >- <smbconfoption name="path">/data/ice</smbconfoption> >- <smbconfoption name="aio read size">1024</smbconfoption> >- <smbconfoption name="aio write size">1024</smbconfoption> >- <smbconfoption name="vfs objects">aio_linux</smbconfoption> >+<smbconfsection name="[cooldata]"/> >+<smbconfoption name="path">/data/ice</smbconfoption> >+<smbconfoption name="aio read size">1024</smbconfoption> >+<smbconfoption name="aio write size">1024</smbconfoption> >+<smbconfoption name="vfs objects">aio_linux</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_aio_pthread.8.xml b/docs-xml/manpages/vfs_aio_pthread.8.xml >index 5bcb544..9c200cf 100644 >--- a/docs-xml/manpages/vfs_aio_pthread.8.xml >+++ b/docs-xml/manpages/vfs_aio_pthread.8.xml >@@ -74,11 +74,11 @@ > <para>Straight forward use:</para> > > <programlisting> >- <smbconfsection name="[cooldata]"/> >- <smbconfoption name="path">/data/ice</smbconfoption> >- <smbconfoption name="aio read size">1024</smbconfoption> >- <smbconfoption name="aio write size">1024</smbconfoption> >- <smbconfoption name="vfs objects">aio_pthread</smbconfoption> >+<smbconfsection name="[cooldata]"/> >+<smbconfoption name="path">/data/ice</smbconfoption> >+<smbconfoption name="aio read size">1024</smbconfoption> >+<smbconfoption name="aio write size">1024</smbconfoption> >+<smbconfoption name="vfs objects">aio_pthread</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_audit.8.xml b/docs-xml/manpages/vfs_audit.8.xml >index c4cad76..ec26a98 100644 >--- a/docs-xml/manpages/vfs_audit.8.xml >+++ b/docs-xml/manpages/vfs_audit.8.xml >@@ -94,10 +94,10 @@ > and NOTICE priority:</para> > > <programlisting> >- <smbconfsection name="[global]"/> >- <smbconfoption name="vfs objects">audit</smbconfoption> >- <smbconfoption name="audit:facility">LOCAL1</smbconfoption> >- <smbconfoption name="audit:priority">NOTICE</smbconfoption> >+<smbconfsection name="[global]"/> >+<smbconfoption name="vfs objects">audit</smbconfoption> >+<smbconfoption name="audit:facility">LOCAL1</smbconfoption> >+<smbconfoption name="audit:priority">NOTICE</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_btrfs.8.xml b/docs-xml/manpages/vfs_btrfs.8.xml >index 85603bc..616ccce 100644 >--- a/docs-xml/manpages/vfs_btrfs.8.xml >+++ b/docs-xml/manpages/vfs_btrfs.8.xml >@@ -90,10 +90,9 @@ > path is a Btrfs subvolume. > </para> > <programlisting> >- <smbconfsection name="[share]"/> >- <smbconfoption name="vfs objects">btrfs</smbconfoption> >- <smbconfoption name="btrfs: manipulate snapshots">no</smbconfoption> >- </programlisting> >+<smbconfsection name="[share]"/> >+<smbconfoption name="vfs objects">btrfs</smbconfoption> >+<smbconfoption name="btrfs: manipulate snapshots">no</smbconfoption></programlisting> > <para> > To use the experimental snapshot manipulation functionality > provided by this module, it must be explicitly enabled, and >@@ -106,15 +105,14 @@ > </para> > > <programlisting> >- <smbconfsection name="[global]"/> >- <smbconfoption name="rpc_daemon:fssd">fork</smbconfoption> >- <smbconfoption name="registry shares">yes</smbconfoption> >- <smbconfoption name="include">registry</smbconfoption> >- >- <smbconfsection name="[share]"/> >- <smbconfoption name="vfs objects">btrfs shadow_copy</smbconfoption> >- <smbconfoption name="btrfs: manipulate snapshots">yes</smbconfoption> >- </programlisting> >+<smbconfsection name="[global]"/> >+<smbconfoption name="rpc_daemon:fssd">fork</smbconfoption> >+<smbconfoption name="registry shares">yes</smbconfoption> >+<smbconfoption name="include">registry</smbconfoption> >+ >+<smbconfsection name="[share]"/> >+<smbconfoption name="vfs objects">btrfs shadow_copy</smbconfoption> >+<smbconfoption name="btrfs: manipulate snapshots">yes</smbconfoption></programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/vfs_cacheprime.8.xml b/docs-xml/manpages/vfs_cacheprime.8.xml >index 278e549..7100a63 100644 >--- a/docs-xml/manpages/vfs_cacheprime.8.xml >+++ b/docs-xml/manpages/vfs_cacheprime.8.xml >@@ -75,9 +75,9 @@ > and aligned on 1 megabyte boundaries: > </para> > <programlisting> >- <smbconfsection name="[hypothetical]"/> >- <smbconfoption name="vfs objects">cacheprime</smbconfoption> >- <smbconfoption name="cacheprime:rsize">1M</smbconfoption> >+<smbconfsection name="[hypothetical]"/> >+<smbconfoption name="vfs objects">cacheprime</smbconfoption> >+<smbconfoption name="cacheprime:rsize">1M</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_cap.8.xml b/docs-xml/manpages/vfs_cap.8.xml >index f5524cd..1fd0d17 100644 >--- a/docs-xml/manpages/vfs_cap.8.xml >+++ b/docs-xml/manpages/vfs_cap.8.xml >@@ -50,10 +50,10 @@ > users in the Shift_JIS locale:</para> > > <programlisting> >- <smbconfsection name="[global]"/> >- <smbconfoption name="dos charset">CP932</smbconfoption> >- <smbconfoption name="dos charset">CP932</smbconfoption> >- <smbconfoption name="vfs objects">cap</smbconfoption> >+<smbconfsection name="[global]"/> >+<smbconfoption name="dos charset">CP932</smbconfoption> >+<smbconfoption name="dos charset">CP932</smbconfoption> >+<smbconfoption name="vfs objects">cap</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_catia.8.xml b/docs-xml/manpages/vfs_catia.8.xml >index d8dac83..f4918a7 100644 >--- a/docs-xml/manpages/vfs_catia.8.xml >+++ b/docs-xml/manpages/vfs_catia.8.xml >@@ -71,18 +71,18 @@ > (¨) on filenames in the [CAD] share:</para> > > <programlisting> >- <smbconfsection name="[CAD]"/> >- <smbconfoption name="path">/data/cad</smbconfoption> >- <smbconfoption name="vfs objects">catia</smbconfoption> >- <smbconfoption name="catia:mappings">0x22:0xa8</smbconfoption> >+<smbconfsection name="[CAD]"/> >+<smbconfoption name="path">/data/cad</smbconfoption> >+<smbconfoption name="vfs objects">catia</smbconfoption> >+<smbconfoption name="catia:mappings">0x22:0xa8</smbconfoption> > </programlisting> > > <para>Perform comprehensive mapping of common Catia filename characters:</para> > <programlisting> >- <smbconfsection name="[CAD]"/> >- <smbconfoption name="path">/data/cad</smbconfoption> >- <smbconfoption name="vfs objects">catia</smbconfoption> >- <smbconfoption name="catia:mappings">0x22:0xa8,0x2a:0xa4,0x2f:0xf8,0x3a:0xf7,0x3c:0xab,0x3e:0xbb,0x3f:0xbf,0x5c:0xff,0x7c:0xa6</smbconfoption> >+<smbconfsection name="[CAD]"/> >+<smbconfoption name="path">/data/cad</smbconfoption> >+<smbconfoption name="vfs objects">catia</smbconfoption> >+<smbconfoption name="catia:mappings">0x22:0xa8,0x2a:0xa4,0x2f:0xf8,0x3a:0xf7,0x3c:0xab,0x3e:0xbb,0x3f:0xbf,0x5c:0xff,0x7c:0xa6</smbconfoption> > </programlisting> > > <para>Server-side filename to be translated (Note that the path delimiter "/" is not used here): >@@ -105,10 +105,10 @@ > <para>A NOT working example:</para> > > <programlisting> >- <smbconfsection name="[CAD]"/> >- <smbconfoption name="path">/data/cad</smbconfoption> >- <smbconfoption name="vfs objects">catia</smbconfoption> >- <smbconfoption name="catia:mappings">0x3a:0x5f</smbconfoption> >+<smbconfsection name="[CAD]"/> >+<smbconfoption name="path">/data/cad</smbconfoption> >+<smbconfoption name="vfs objects">catia</smbconfoption> >+<smbconfoption name="catia:mappings">0x3a:0x5f</smbconfoption> > </programlisting> > > <para>Here the colon ":" is mapped to the underscore "_".</para> >diff --git a/docs-xml/manpages/vfs_ceph.8.xml b/docs-xml/manpages/vfs_ceph.8.xml >index c492d31..0686e89 100644 >--- a/docs-xml/manpages/vfs_ceph.8.xml >+++ b/docs-xml/manpages/vfs_ceph.8.xml >@@ -60,9 +60,8 @@ > </para> > > <programlisting> >- <smbconfsection name="[share]"/> >- <smbconfoption name="vfs objects">ceph</smbconfoption> >- </programlisting> >+<smbconfsection name="[share]"/> >+<smbconfoption name="vfs objects">ceph</smbconfoption></programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/vfs_commit.8.xml b/docs-xml/manpages/vfs_commit.8.xml >index 204dcd7..2954d78 100644 >--- a/docs-xml/manpages/vfs_commit.8.xml >+++ b/docs-xml/manpages/vfs_commit.8.xml >@@ -77,10 +77,10 @@ > <para>Synchronize the file data on the [precious] share after > every 512 kilobytes (524288 bytes) of data is written:</para> > <programlisting> >- <smbconfsection name="[precious]"/> >- <smbconfoption name="path">/data/precious</smbconfoption> >- <smbconfoption name="vfs objects">commit</smbconfoption> >- <smbconfoption name="commit:dthresh">512K</smbconfoption> >+<smbconfsection name="[precious]"/> >+<smbconfoption name="path">/data/precious</smbconfoption> >+<smbconfoption name="vfs objects">commit</smbconfoption> >+<smbconfoption name="commit:dthresh">512K</smbconfoption> > </programlisting> > </refsect1> > >diff --git a/docs-xml/manpages/vfs_crossrename.8.xml b/docs-xml/manpages/vfs_crossrename.8.xml >index a9d7e6b..9632186 100644 >--- a/docs-xml/manpages/vfs_crossrename.8.xml >+++ b/docs-xml/manpages/vfs_crossrename.8.xml >@@ -92,10 +92,10 @@ > for all files sized up to 50MB:</para> > > <programlisting> >- <smbconfsection name="[testshare]"/> >- <smbconfoption name="path">/data/mounts</smbconfoption> >- <smbconfoption name="vfs objects">crossrename</smbconfoption> >- <smbconfoption name="crossrename:sizelimit">50</smbconfoption> >+<smbconfsection name="[testshare]"/> >+<smbconfoption name="path">/data/mounts</smbconfoption> >+<smbconfoption name="vfs objects">crossrename</smbconfoption> >+<smbconfoption name="crossrename:sizelimit">50</smbconfoption> > </programlisting> > </refsect1> > >diff --git a/docs-xml/manpages/vfs_default_quota.8.xml b/docs-xml/manpages/vfs_default_quota.8.xml >index e961246..5ebcf9b8 100644 >--- a/docs-xml/manpages/vfs_default_quota.8.xml >+++ b/docs-xml/manpages/vfs_default_quota.8.xml >@@ -108,10 +108,10 @@ > limits:</para> > > <programlisting> >- <smbconfsection name="[global]"/> >- <smbconfoption name="vfs objects">default_quota</smbconfoption> >- <smbconfoption name="default_quota:uid">65535</smbconfoption> >- <smbconfoption name="default_quota:uid nolimit">yes</smbconfoption> >+<smbconfsection name="[global]"/> >+<smbconfoption name="vfs objects">default_quota</smbconfoption> >+<smbconfoption name="default_quota:uid">65535</smbconfoption> >+<smbconfoption name="default_quota:uid nolimit">yes</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_dirsort.8.xml b/docs-xml/manpages/vfs_dirsort.8.xml >index 758696e..4b5136d 100644 >--- a/docs-xml/manpages/vfs_dirsort.8.xml >+++ b/docs-xml/manpages/vfs_dirsort.8.xml >@@ -43,8 +43,8 @@ > <para>Sort directories for all shares:</para> > > <programlisting> >- <smbconfsection name="[global]"/> >- <smbconfoption name="vfs objects">dirsort</smbconfoption> >+<smbconfsection name="[global]"/> >+<smbconfoption name="vfs objects">dirsort</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_fake_perms.8.xml b/docs-xml/manpages/vfs_fake_perms.8.xml >index ebe5d53..57bd1d2 100644 >--- a/docs-xml/manpages/vfs_fake_perms.8.xml >+++ b/docs-xml/manpages/vfs_fake_perms.8.xml >@@ -46,9 +46,9 @@ > <title>EXAMPLES</title> > > <programlisting> >- <smbconfsection name="[Profiles]"/> >- <smbconfoption name="path">/profiles</smbconfoption> >- <smbconfoption name="vfs objects">fake_perms</smbconfoption> >+<smbconfsection name="[Profiles]"/> >+<smbconfoption name="path">/profiles</smbconfoption> >+<smbconfoption name="vfs objects">fake_perms</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_fileid.8.xml b/docs-xml/manpages/vfs_fileid.8.xml >index fc2e834..2657e50 100644 >--- a/docs-xml/manpages/vfs_fileid.8.xml >+++ b/docs-xml/manpages/vfs_fileid.8.xml >@@ -85,9 +85,9 @@ > <command>fsid</command> algorithm:</para> > > <programlisting> >- <smbconfsection name="[global]"/> >- <smbconfoption name="vfs objects">fileid</smbconfoption> >- <smbconfoption name="fileid:algorithm">fsid</smbconfoption> >+<smbconfsection name="[global]"/> >+<smbconfoption name="vfs objects">fileid</smbconfoption> >+<smbconfoption name="fileid:algorithm">fsid</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_fruit.8.xml b/docs-xml/manpages/vfs_fruit.8.xml >index 7097aac..354a537 100644 >--- a/docs-xml/manpages/vfs_fruit.8.xml >+++ b/docs-xml/manpages/vfs_fruit.8.xml >@@ -339,12 +339,12 @@ > <title>EXAMPLES</title> > > <programlisting> >- <smbconfsection name="[share]"/> >- <smbconfoption name="vfs objects">catia fruit streams_xattr</smbconfoption> >- <smbconfoption name="fruit:resource">file</smbconfoption> >- <smbconfoption name="fruit:metadata">netatalk</smbconfoption> >- <smbconfoption name="fruit:locking">netatalk</smbconfoption> >- <smbconfoption name="fruit:encoding">native</smbconfoption> >+<smbconfsection name="[share]"/> >+<smbconfoption name="vfs objects">catia fruit streams_xattr</smbconfoption> >+<smbconfoption name="fruit:resource">file</smbconfoption> >+<smbconfoption name="fruit:metadata">netatalk</smbconfoption> >+<smbconfoption name="fruit:locking">netatalk</smbconfoption> >+<smbconfoption name="fruit:encoding">native</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_full_audit.8.xml b/docs-xml/manpages/vfs_full_audit.8.xml >index cefe66d..15179fb 100644 >--- a/docs-xml/manpages/vfs_full_audit.8.xml >+++ b/docs-xml/manpages/vfs_full_audit.8.xml >@@ -123,8 +123,7 @@ > format consisting of fields separated by '|' characters. The > format is: </para> > <programlisting> >- smbd_audit: PREFIX|OPERATION|RESULT|FILE >- </programlisting> >+smbd_audit: PREFIX|OPERATION|RESULT|FILE</programlisting> > > <para>The record fields are:</para> > >@@ -235,14 +234,14 @@ > on failures:</para> > > <programlisting> >- <smbconfsection name="[records]"/> >- <smbconfoption name="path">/data/records</smbconfoption> >- <smbconfoption name="vfs objects">full_audit</smbconfoption> >- <smbconfoption name="full_audit:prefix">%u|%I</smbconfoption> >- <smbconfoption name="full_audit:success">open opendir</smbconfoption> >- <smbconfoption name="full_audit:failure">all !open</smbconfoption> >- <smbconfoption name="full_audit:facility">LOCAL7</smbconfoption> >- <smbconfoption name="full_audit:priority">ALERT</smbconfoption> >+<smbconfsection name="[records]"/> >+<smbconfoption name="path">/data/records</smbconfoption> >+<smbconfoption name="vfs objects">full_audit</smbconfoption> >+<smbconfoption name="full_audit:prefix">%u|%I</smbconfoption> >+<smbconfoption name="full_audit:success">open opendir</smbconfoption> >+<smbconfoption name="full_audit:failure">all !open</smbconfoption> >+<smbconfoption name="full_audit:facility">LOCAL7</smbconfoption> >+<smbconfoption name="full_audit:priority">ALERT</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_glusterfs.8.xml b/docs-xml/manpages/vfs_glusterfs.8.xml >index 61ad9f4..3a0ec9d 100644 >--- a/docs-xml/manpages/vfs_glusterfs.8.xml >+++ b/docs-xml/manpages/vfs_glusterfs.8.xml >@@ -66,12 +66,11 @@ > </para> > > <programlisting> >- <smbconfsection name="[share]"/> >- <smbconfoption name="vfs objects">glusterfs</smbconfoption> >- <smbconfoption name="path">/relative/base/path</smbconfoption> >- <smbconfoption name="glusterfs:volume">gv0</smbconfoption> >- <smbconfoption name="kernel share modes">no</smbconfoption> >- </programlisting> >+<smbconfsection name="[share]"/> >+<smbconfoption name="vfs objects">glusterfs</smbconfoption> >+<smbconfoption name="path">/relative/base/path</smbconfoption> >+<smbconfoption name="glusterfs:volume">gv0</smbconfoption> >+<smbconfoption name="kernel share modes">no</smbconfoption></programlisting> > > <para> > Note that since <command>vfs_glusterfs</command> does not >diff --git a/docs-xml/manpages/vfs_gpfs.8.xml b/docs-xml/manpages/vfs_gpfs.8.xml >index 8c41df5..91a3878 100644 >--- a/docs-xml/manpages/vfs_gpfs.8.xml >+++ b/docs-xml/manpages/vfs_gpfs.8.xml >@@ -449,11 +449,11 @@ > <para>A GPFS mount can be exported via Samba as follows :</para> > > <programlisting> >- <smbconfsection name="[samba_gpfs_share]"/> >- <smbconfoption name="vfs objects">gpfs</smbconfoption> >- <smbconfoption name="path">/test/gpfs_mount</smbconfoption> >- <smbconfoption name="nfs4: mode">special</smbconfoption> >- <smbconfoption name="nfs4: acedup">merge</smbconfoption> >+<smbconfsection name="[samba_gpfs_share]"/> >+<smbconfoption name="vfs objects">gpfs</smbconfoption> >+<smbconfoption name="path">/test/gpfs_mount</smbconfoption> >+<smbconfoption name="nfs4: mode">special</smbconfoption> >+<smbconfoption name="nfs4: acedup">merge</smbconfoption> > </programlisting> > </refsect1> > >diff --git a/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml b/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml >index ae096e6..b42f132 100644 >--- a/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml >+++ b/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml >@@ -48,8 +48,8 @@ > > <para>Add syncops functionality for [share]:</para> > <programlisting> >- <smbconfsection name="[share]"/> >- <smbconfoption name="vfs objects">linux_xfs_sgid</smbconfoption> >+<smbconfsection name="[share]"/> >+<smbconfoption name="vfs objects">linux_xfs_sgid</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_media_harmony.8.xml b/docs-xml/manpages/vfs_media_harmony.8.xml >index 082e98d..aa6a6cb 100644 >--- a/docs-xml/manpages/vfs_media_harmony.8.xml >+++ b/docs-xml/manpages/vfs_media_harmony.8.xml >@@ -74,30 +74,30 @@ > > <para>Enable media_harmony for Mac and Windows clients:</para> > <programlisting> >- <smbconfsection name="[avid_mac]"/> >- <smbconfoption name="path">/avid</smbconfoption> >- <smbconfoption name="vfs objects">media_harmony</smbconfoption> >- <smbconfoption name="cache locked write times">no</smbconfoption> >- <smbconfsection name="[avid_win]"/> >- <smbconfoption name="path">/avid</smbconfoption> >- <smbconfoption name="vfs objects">media_harmony</smbconfoption> >- <smbconfoption name="cache locked write times">no</smbconfoption> >- <smbconfoption name="veto files">/.DS_Store/._@/.Trash@/.Spotlight@/.hidden/.hotfiles@/.vol/</smbconfoption> >- <smbconfoption name="delete veto files">yes</smbconfoption> >+<smbconfsection name="[avid_mac]"/> >+<smbconfoption name="path">/avid</smbconfoption> >+<smbconfoption name="vfs objects">media_harmony</smbconfoption> >+<smbconfoption name="cache locked write times">no</smbconfoption> >+<smbconfsection name="[avid_win]"/> >+<smbconfoption name="path">/avid</smbconfoption> >+<smbconfoption name="vfs objects">media_harmony</smbconfoption> >+<smbconfoption name="cache locked write times">no</smbconfoption> >+<smbconfoption name="veto files">/.DS_Store/._@/.Trash@/.Spotlight@/.hidden/.hotfiles@/.vol/</smbconfoption> >+<smbconfoption name="delete veto files">yes</smbconfoption> > </programlisting> > > <para>Create the files that will allow users david and susan > to control their own Avid database refreshes:</para> > <programlisting> >- touch '/avid/OMFI MediaFiles_192.168.1.10_david' \ >- '/avid/OMFI MediaFiles_192.168.1.11_susan' \ >- '/avid/Avid MediaFiles/MXF/1_192.168.1.10_david' \ >- '/avid/Avid MediaFiles/MXF/1_192.168.1.11_susan' >+touch '/avid/OMFI MediaFiles_192.168.1.10_david' \ >+ '/avid/OMFI MediaFiles_192.168.1.11_susan' \ >+ '/avid/Avid MediaFiles/MXF/1_192.168.1.10_david' \ >+ '/avid/Avid MediaFiles/MXF/1_192.168.1.11_susan' > </programlisting> > <para>Trigger an Avid database refresh for user david:</para> > <programlisting> >- touch '/avid/OMFI MediaFiles_192.168.1.10_david' \ >- '/avid/Avid MediaFiles/MXF/1_192.168.1.10_david' >+touch '/avid/OMFI MediaFiles_192.168.1.10_david' \ >+ '/avid/Avid MediaFiles/MXF/1_192.168.1.10_david' > </programlisting> > > <para>If you have a large number of Avid media folders to manage, >diff --git a/docs-xml/manpages/vfs_netatalk.8.xml b/docs-xml/manpages/vfs_netatalk.8.xml >index 3290616..7cf2fbe 100644 >--- a/docs-xml/manpages/vfs_netatalk.8.xml >+++ b/docs-xml/manpages/vfs_netatalk.8.xml >@@ -43,8 +43,8 @@ > > <para>Hide .AppleDouble files on the [data] share:</para> > <programlisting> >- <smbconfsection name="[data]"/> >- <smbconfoption name="vfs objects">netatalk</smbconfoption> >+<smbconfsection name="[data]"/> >+<smbconfoption name="vfs objects">netatalk</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_offline.8.xml b/docs-xml/manpages/vfs_offline.8.xml >index 593b2c6..ef8864d 100644 >--- a/docs-xml/manpages/vfs_offline.8.xml >+++ b/docs-xml/manpages/vfs_offline.8.xml >@@ -46,8 +46,8 @@ > <para>Mark all files in a share as offline:</para> > > <programlisting> >- <smbconfsection name="[remote]"/> >- <smbconfoption name="vfs objects">offline</smbconfoption> >+<smbconfsection name="[remote]"/> >+<smbconfoption name="vfs objects">offline</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_prealloc.8.xml b/docs-xml/manpages/vfs_prealloc.8.xml >index 1be6c1f..df0eea4 100644 >--- a/docs-xml/manpages/vfs_prealloc.8.xml >+++ b/docs-xml/manpages/vfs_prealloc.8.xml >@@ -73,10 +73,10 @@ > (4194304 bytes): </para> > > <programlisting> >- <smbconfsection name="[frames]"/> >- <smbconfoption name="path">/data/frames</smbconfoption> >- <smbconfoption name="vfs objects">prealloc</smbconfoption> >- <smbconfoption name="prealloc:tiff">4M</smbconfoption> >+<smbconfsection name="[frames]"/> >+<smbconfoption name="path">/data/frames</smbconfoption> >+<smbconfoption name="vfs objects">prealloc</smbconfoption> >+<smbconfoption name="prealloc:tiff">4M</smbconfoption> > </programlisting> > </refsect1> > >diff --git a/docs-xml/manpages/vfs_readahead.8.xml b/docs-xml/manpages/vfs_readahead.8.xml >index d757585..cd96af1 100644 >--- a/docs-xml/manpages/vfs_readahead.8.xml >+++ b/docs-xml/manpages/vfs_readahead.8.xml >@@ -90,8 +90,8 @@ > <title>EXAMPLES</title> > > <programlisting> >- <smbconfsection name="[hypothetical]"/> >- <smbconfoption name="vfs objects">readahead</smbconfoption> >+<smbconfsection name="[hypothetical]"/> >+<smbconfoption name="vfs objects">readahead</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_readonly.8.xml b/docs-xml/manpages/vfs_readonly.8.xml >index ed3eb80..c13377c 100644 >--- a/docs-xml/manpages/vfs_readonly.8.xml >+++ b/docs-xml/manpages/vfs_readonly.8.xml >@@ -68,16 +68,16 @@ > > <para>Mark all shares read only:</para> > <programlisting> >- <smbconfsection name="[global]"/> >- <smbconfoption name="vfs objects">readonly</smbconfoption> >+<smbconfsection name="[global]"/> >+<smbconfoption name="vfs objects">readonly</smbconfoption> > </programlisting> > > <para>Mark the [backup] share as read only during business hours:</para> > <programlisting> >- <smbconfsection name="[backup]"/> >- <smbconfoption name="path">/readonly</smbconfoption> >- <smbconfoption name="vfs objects">readonly</smbconfoption> >- <smbconfoption name="readonly:period">readonly:period = "today 9:00","today 17:00"</smbconfoption> >+<smbconfsection name="[backup]"/> >+<smbconfoption name="path">/readonly</smbconfoption> >+<smbconfoption name="vfs objects">readonly</smbconfoption> >+<smbconfoption name="readonly:period">readonly:period = "today 9:00","today 17:00"</smbconfoption> > </programlisting> > </refsect1> > >diff --git a/docs-xml/manpages/vfs_recycle.8.xml b/docs-xml/manpages/vfs_recycle.8.xml >index 30a9210..aaf3313 100644 >--- a/docs-xml/manpages/vfs_recycle.8.xml >+++ b/docs-xml/manpages/vfs_recycle.8.xml >@@ -190,12 +190,12 @@ > </para> > > <programlisting> >- <smbconfsection name="[share]"/> >- <smbconfoption name="path">/data/share</smbconfoption> >- <smbconfoption name="vfs objects">recycle</smbconfoption> >- <smbconfoption name="recycle:repository">.recycle</smbconfoption> >- <smbconfoption name="recycle:keeptree">yes</smbconfoption> >- <smbconfoption name="recycle:versions">yes</smbconfoption> >+<smbconfsection name="[share]"/> >+<smbconfoption name="path">/data/share</smbconfoption> >+<smbconfoption name="vfs objects">recycle</smbconfoption> >+<smbconfoption name="recycle:repository">.recycle</smbconfoption> >+<smbconfoption name="recycle:keeptree">yes</smbconfoption> >+<smbconfoption name="recycle:versions">yes</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_shadow_copy.8.xml b/docs-xml/manpages/vfs_shadow_copy.8.xml >index 4710cd6..64d7872 100644 >--- a/docs-xml/manpages/vfs_shadow_copy.8.xml >+++ b/docs-xml/manpages/vfs_shadow_copy.8.xml >@@ -68,8 +68,7 @@ > <citerefentry><refentrytitle>date</refentrytitle> > <manvolnum>1</manvolnum></citerefentry> command: > <programlisting> >- TZ=GMT date +@GMT-%Y.%m.%d-%H.%M.%S >- </programlisting></para> >+TZ=GMT date +@GMT-%Y.%m.%d-%H.%M.%S</programlisting></para> > > </refsect1> > >@@ -78,8 +77,8 @@ > > <para>Add shadow copy support to user home directories:</para> > <programlisting> >- <smbconfsection name="[homes]"/> >- <smbconfoption name="vfs objects">shadow_copy</smbconfoption> >+<smbconfsection name="[homes]"/> >+<smbconfoption name="vfs objects">shadow_copy</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_shadow_copy2.8.xml b/docs-xml/manpages/vfs_shadow_copy2.8.xml >index ad69cff..6d59495 100644 >--- a/docs-xml/manpages/vfs_shadow_copy2.8.xml >+++ b/docs-xml/manpages/vfs_shadow_copy2.8.xml >@@ -123,8 +123,7 @@ > <citerefentry><refentrytitle>date</refentrytitle> > <manvolnum>1</manvolnum></citerefentry> command: > <programlisting> >- TZ=GMT date +@GMT-%Y.%m.%d-%H.%M.%S >- </programlisting></para> >+TZ=GMT date +@GMT-%Y.%m.%d-%H.%M.%S</programlisting></para> > > </refsect1> > >@@ -448,11 +447,11 @@ > > <para>Add shadow copy support to user home directories:</para> > <programlisting> >- <smbconfsection name="[homes]"/> >- <smbconfoption name="vfs objects">shadow_copy2</smbconfoption> >- <smbconfoption name="shadow:snapdir">/data/snapshots</smbconfoption> >- <smbconfoption name="shadow:basedir">/data/home</smbconfoption> >- <smbconfoption name="shadow:sort">desc</smbconfoption> >+<smbconfsection name="[homes]"/> >+<smbconfoption name="vfs objects">shadow_copy2</smbconfoption> >+<smbconfoption name="shadow:snapdir">/data/snapshots</smbconfoption> >+<smbconfoption name="shadow:basedir">/data/home</smbconfoption> >+<smbconfoption name="shadow:sort">desc</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_shell_snap.8.xml b/docs-xml/manpages/vfs_shell_snap.8.xml >index f69fcff..b02ed09 100644 >--- a/docs-xml/manpages/vfs_shell_snap.8.xml >+++ b/docs-xml/manpages/vfs_shell_snap.8.xml >@@ -112,26 +112,21 @@ > <title>CONFIGURATION</title> > > <programlisting> >- <smbconfsection name="[share]"/> >- <smbconfoption name="vfs objects">shell_snap</smbconfoption> >- <smbconfoption name="shell_snap:check path command"> >- snap_check_path.sh</smbconfoption> >- <smbconfoption name="shell_snap:create command"> >- snap_create.sh</smbconfoption> >- <smbconfoption name="shell_snap:delete command"> >- snap_delete.sh</smbconfoption> >- </programlisting> >+<smbconfsection name="[share]"/> >+<smbconfoption name="vfs objects">shell_snap</smbconfoption> >+<smbconfoption name="shell_snap:check path command">snap_check_path.sh</smbconfoption> >+<smbconfoption name="shell_snap:create command">snap_create.sh</smbconfoption> >+<smbconfoption name="shell_snap:delete command">snap_delete.sh</smbconfoption></programlisting> > > <para> > Samba's FSRVP server must be configured in the [global] section: > </para> > > <programlisting> >- <smbconfsection name="[global]"/> >- <smbconfoption name="rpc_daemon:fssd">fork</smbconfoption> >- <smbconfoption name="registry shares">yes</smbconfoption> >- <smbconfoption name="include">registry</smbconfoption> >- </programlisting> >+<smbconfsection name="[global]"/> >+<smbconfoption name="rpc_daemon:fssd">fork</smbconfoption> >+<smbconfoption name="registry shares">yes</smbconfoption> >+<smbconfoption name="include">registry</smbconfoption></programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/vfs_snapper.8.xml b/docs-xml/manpages/vfs_snapper.8.xml >index 0cc223f..6834b08 100644 >--- a/docs-xml/manpages/vfs_snapper.8.xml >+++ b/docs-xml/manpages/vfs_snapper.8.xml >@@ -59,9 +59,8 @@ > </para> > > <programlisting> >- <smbconfsection name="[share]"/> >- <smbconfoption name="vfs objects">snapper</smbconfoption> >- </programlisting> >+<smbconfsection name="[share]"/> >+<smbconfoption name="vfs objects">snapper</smbconfoption></programlisting> > > <para> > For remote snapshot creation and deletion, Samba's FSRVP >@@ -69,11 +68,10 @@ > </para> > > <programlisting> >- <smbconfsection name="[global]"/> >- <smbconfoption name="rpc_daemon:fssd">fork</smbconfoption> >- <smbconfoption name="registry shares">yes</smbconfoption> >- <smbconfoption name="include">registry</smbconfoption> >- </programlisting> >+<smbconfsection name="[global]"/> >+<smbconfoption name="rpc_daemon:fssd">fork</smbconfoption> >+<smbconfoption name="registry shares">yes</smbconfoption> >+<smbconfoption name="include">registry</smbconfoption></programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/vfs_streams_depot.8.xml b/docs-xml/manpages/vfs_streams_depot.8.xml >index 7f0ad84..5fcfe7c 100644 >--- a/docs-xml/manpages/vfs_streams_depot.8.xml >+++ b/docs-xml/manpages/vfs_streams_depot.8.xml >@@ -78,8 +78,8 @@ > <title>EXAMPLES</title> > > <programlisting> >- <smbconfsection name="[share]"/> >- <smbconfoption name="vfs objects">streams_depot</smbconfoption> >+<smbconfsection name="[share]"/> >+<smbconfoption name="vfs objects">streams_depot</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_streams_xattr.8.xml b/docs-xml/manpages/vfs_streams_xattr.8.xml >index e2b9130..e4a2cd9 100644 >--- a/docs-xml/manpages/vfs_streams_xattr.8.xml >+++ b/docs-xml/manpages/vfs_streams_xattr.8.xml >@@ -83,8 +83,8 @@ > <title>EXAMPLES</title> > > <programlisting> >- <smbconfsection name="[share]"/> >- <smbconfoption name="vfs objects">streams_xattr</smbconfoption> >+<smbconfsection name="[share]"/> >+<smbconfoption name="vfs objects">streams_xattr</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_syncops.8.xml b/docs-xml/manpages/vfs_syncops.8.xml >index 2efc711..f2914fe 100644 >--- a/docs-xml/manpages/vfs_syncops.8.xml >+++ b/docs-xml/manpages/vfs_syncops.8.xml >@@ -71,10 +71,10 @@ > > <para>Add syncops functionality for [share]:</para> > <programlisting> >- <smbconfsection name="[share]"/> >- <smbconfoption name="path">/data/share</smbconfoption> >- <smbconfoption name="vfs objects">syncops</smbconfoption> >- <smbconfoption name="syncops:onclose">no</smbconfoption> >+<smbconfsection name="[share]"/> >+<smbconfoption name="path">/data/share</smbconfoption> >+<smbconfoption name="vfs objects">syncops</smbconfoption> >+<smbconfoption name="syncops:onclose">no</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_time_audit.8.xml b/docs-xml/manpages/vfs_time_audit.8.xml >index 179f67d..91d9389 100644 >--- a/docs-xml/manpages/vfs_time_audit.8.xml >+++ b/docs-xml/manpages/vfs_time_audit.8.xml >@@ -71,10 +71,10 @@ > <para>This would log VFS calls that take longer than 3 seconds:</para> > > <programlisting> >- <smbconfsection name="[sample_share]"/> >- <smbconfoption name="path">/test/sample_share</smbconfoption> >- <smbconfoption name="vfs objects">time_audit</smbconfoption> >- <smbconfoption name="time_audit:timeout">3000</smbconfoption> >+<smbconfsection name="[sample_share]"/> >+<smbconfoption name="path">/test/sample_share</smbconfoption> >+<smbconfoption name="vfs objects">time_audit</smbconfoption> >+<smbconfoption name="time_audit:timeout">3000</smbconfoption> > </programlisting> > </refsect1> > >diff --git a/docs-xml/manpages/vfs_tsmsm.8.xml b/docs-xml/manpages/vfs_tsmsm.8.xml >index 72dc3eb..75722f3 100644 >--- a/docs-xml/manpages/vfs_tsmsm.8.xml >+++ b/docs-xml/manpages/vfs_tsmsm.8.xml >@@ -111,9 +111,9 @@ > <para>A GPFS mount with TSM support can be exported via Samba as follows:</para> > > <programlisting> >- <smbconfsection name="[gpfs_tsm_share]"/> >- <smbconfoption name="vfs objects">tsmsm gpfs</smbconfoption> >- <smbconfoption name="path">/test/gpfs_mount</smbconfoption> >+<smbconfsection name="[gpfs_tsm_share]"/> >+<smbconfoption name="vfs objects">tsmsm gpfs</smbconfoption> >+<smbconfoption name="path">/test/gpfs_mount</smbconfoption> > </programlisting> > </refsect1> > >diff --git a/docs-xml/manpages/vfs_unityed_media.8.xml b/docs-xml/manpages/vfs_unityed_media.8.xml >index cb5e8af..499db5d 100644 >--- a/docs-xml/manpages/vfs_unityed_media.8.xml >+++ b/docs-xml/manpages/vfs_unityed_media.8.xml >@@ -83,14 +83,14 @@ > > <para>Enable unityed_media for Mac and Windows clients:</para> > <programlisting> >- <smbconfsection name="[avid_mac]"/> >- <smbconfoption name="path">/avid</smbconfoption> >- <smbconfoption name="vfs objects">unityed_media</smbconfoption> >- <smbconfsection name="[avid_win]"/> >- <smbconfoption name="path">/avid</smbconfoption> >- <smbconfoption name="vfs objects">unityed_media</smbconfoption> >- <smbconfoption name="veto files">/.DS_Store/._@/.Trash@/.Spotlight@/.hidden/.hotfiles@/.vol/</smbconfoption> >- <smbconfoption name="delete veto files">yes</smbconfoption> >+<smbconfsection name="[avid_mac]"/> >+<smbconfoption name="path">/avid</smbconfoption> >+<smbconfoption name="vfs objects">unityed_media</smbconfoption> >+<smbconfsection name="[avid_win]"/> >+<smbconfoption name="path">/avid</smbconfoption> >+<smbconfoption name="vfs objects">unityed_media</smbconfoption> >+<smbconfoption name="veto files">/.DS_Store/._@/.Trash@/.Spotlight@/.hidden/.hotfiles@/.vol/</smbconfoption> >+<smbconfoption name="delete veto files">yes</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_worm.8.xml b/docs-xml/manpages/vfs_worm.8.xml >index 594d51d..d30c443 100644 >--- a/docs-xml/manpages/vfs_worm.8.xml >+++ b/docs-xml/manpages/vfs_worm.8.xml >@@ -66,9 +66,9 @@ > than five minutes (300 seconds):</para> > > <programlisting> >- <smbconfsection name="[wormshare]"/> >- <smbconfoption name="vfs objects">worm</smbconfoption> >- <smbconfoption name="worm:grace_period">300</smbconfoption> >+<smbconfsection name="[wormshare]"/> >+<smbconfoption name="vfs objects">worm</smbconfoption> >+<smbconfoption name="worm:grace_period">300</smbconfoption> > </programlisting> > > </refsect1> >diff --git a/docs-xml/manpages/vfs_zfsacl.8.xml b/docs-xml/manpages/vfs_zfsacl.8.xml >index a4a4821..93935aa 100644 >--- a/docs-xml/manpages/vfs_zfsacl.8.xml >+++ b/docs-xml/manpages/vfs_zfsacl.8.xml >@@ -134,11 +134,11 @@ > <para>A ZFS mount can be exported via Samba as follows :</para> > > <programlisting> >- <smbconfsection name="[samba_zfs_share]"/> >- <smbconfoption name="vfs objects">zfsacl</smbconfoption> >- <smbconfoption name="path">/test/zfs_mount</smbconfoption> >- <smbconfoption name="nfs4: mode">special</smbconfoption> >- <smbconfoption name="nfs4: acedup">merge</smbconfoption> >+<smbconfsection name="[samba_zfs_share]"/> >+<smbconfoption name="vfs objects">zfsacl</smbconfoption> >+<smbconfoption name="path">/test/zfs_mount</smbconfoption> >+<smbconfoption name="nfs4: mode">special</smbconfoption> >+<smbconfoption name="nfs4: acedup">merge</smbconfoption> > </programlisting> > </refsect1> >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=13405">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 12918
: 13405