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 @@ An example of the record format accepted by eventlogadm: - 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: - +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: Set up an eventlog source, specifying a message file DLL: - eventlogadm -o addsource Application MyApplication | \\ - %SystemRoot%/system32/MyApplication.dll - +eventlogadm -o addsource Application MyApplication | \\ + %SystemRoot%/system32/MyApplication.dll Filter messages from the system log into an event log: - tail -f /var/log/messages | \\ - my_program_to_parse_into_eventlog_records | \\ - eventlogadm SystemLogEvents - +tail -f /var/log/messages | \\ + my_program_to_parse_into_eventlog_records | \\ + eventlogadm SystemLogEvents 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 @@ - [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 - +idmap config CORP : backend = ad +idmap config CORP : range = 1000-999999 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 @@ The Unix ID for a RID is calculated this way: - ID = REDUCED RID + IDMAP RANGE LOW VALUE + RANGE NUMBER * RANGE SIZE - +ID = REDUCED RID + IDMAP RANGE LOW VALUE + RANGE NUMBER * RANGE SIZE 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: - RID = (ID - LOW ID) % RANGE SIZE + DOMAIN RANGE INDEX * RANGE SIZE - +RID = (ID - LOW ID) % RANGE SIZE + DOMAIN RANGE INDEX * RANGE SIZE Where the DOMAIN RANGE INDEX is retrieved from the database along with the domain sid by the RANGE NUMBER = (ID - LOW ID) / RANGE SIZE . @@ -129,15 +127,13 @@ - [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 - - +idmap config * : backend = autorid +idmap config * : range = 1000000-1999999 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 @@ - [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 - +[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 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 @@ - [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 - +[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 This example shows how ldap can be used as a readonly backend while @@ -106,18 +105,17 @@ - [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 - +[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 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 @@ - [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 - +idmap config SAMBA : backend = nss +idmap config SAMBA : range = 1000-999999 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. - [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 - +[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 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 @@ The Unix ID for a RID is calculated this way: - ID = RID - BASE_RID + LOW_RANGE_ID. - +ID = RID - BASE_RID + LOW_RANGE_ID Correspondingly, the formula for calculating the RID for a given Unix ID is this: - RID = ID + BASE_RID - LOW_RANGE_ID. - +RID = ID + BASE_RID - LOW_RANGE_ID @@ -96,19 +94,18 @@ - [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 - +idmap config TRUSTED : backend = rid +idmap config TRUSTED : range = 50000 - 99999 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 @@ - SIDTOID S-1-xxxx - IDTOSID UID xxxx - IDTOSID GID xxxx - IDTOSID XID xxxx - +SIDTOID S-1-xxxx +IDTOSID UID xxxx +IDTOSID GID xxxx +IDTOSID XID xxxx And it should return one of the following responses as a single line of @@ -90,12 +89,11 @@ - UID:yyyy - GID:yyyy - XID:yyyy - SID:ssss - ERR:yyyy - +UID:yyyy +GID:yyyy +XID:yyyy +SID:ssss +ERR:yyyy XID indicates that the ID returned should be both a UID and a GID. @@ -114,33 +112,31 @@ - [global] - idmap config * : backend = script - idmap config * : range = 1000000-2000000 - idmap config * : script = /usr/local/samba/bin/idmap_script.sh - +[global] +idmap config * : backend = script +idmap config * : range = 1000000-2000000 +idmap config * : script = /usr/local/samba/bin/idmap_script.sh This shows a simple script to partially perform the task: - #!/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 - +#!/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 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 @@ - [global] - # "backend = tdb" is redundant here since it is the default - idmap config * : backend = tdb - idmap config * : range = 1000000-2000000 - +[global] +# "backend = tdb" is redundant here since it is the default +idmap config * : backend = tdb +idmap config * : range = 1000000-2000000 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 @@ - SIDTOID S-1-xxxx - IDTOSID UID xxxx - IDTOSID GID xxxx - +SIDTOID S-1-xxxx +IDTOSID UID xxxx +IDTOSID GID xxxx And it should return one of the following responses as a single line of @@ -90,11 +89,10 @@ - UID:yyyy - GID:yyyy - SID:yyyy - ERR:yyyy - +UID:yyyy +GID:yyyy +SID:yyyy +ERR:yyyy @@ -105,10 +103,9 @@ - [global] - idmap config * : backend = tdb2 - idmap config * : range = 1000000-2000000 - +[global] +idmap config * : backend = tdb2 +idmap config * : range = 1000000-2000000 This example shows how tdb2 is used as a the default idmap backend @@ -116,11 +113,10 @@ - [global] - idmap config * : backend = tdb2 - idmap config * : range = 1000000-2000000 - idmap config * : script = /usr/local/samba/bin/idmap_script.sh - +[global] +idmap config * : backend = tdb2 +idmap config * : range = 1000000-2000000 +idmap config * : script = /usr/local/samba/bin/idmap_script.sh 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 @@ Extract all network traffic from all samba log files: - $ log2pcap < /var/log/* > trace.pcap - +$ log2pcap < /var/log/* > trace.pcap Convert to pcap using text2pcap: - $ log2pcap -h samba.log | text2pcap -T 139,139 - trace.pcap - +$ log2pcap -h samba.log | text2pcap -T 139,139 - trace.pcap 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 @@ Edit the PAM system config /etc/pam.d/service and modify it as the following example shows: - ... - 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 - ... - + ... + 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 + ... 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: - REVISION:<revision number> - OWNER:<sid or name> - GROUP:<sid or name> - ACL:<sid or name>:<type>/<flags>/<mask> - +REVISION:<revision number> +OWNER:<sid or name> +GROUP:<sid or name> +ACL:<sid or name>:<type>/<flags>/<mask> The revision of the ACL specifies the internal Windows NT ACL revision for the security descriptor. @@ -217,21 +216,19 @@ - host:~ # sharesec share -a S-1-5-21-1866488690-1365729215-3963860297-17724:ALLOWED/0/FULL - +host:~ # sharesec share -a S-1-5-21-1866488690-1365729215-3963860297-17724:ALLOWED/0/FULL List all ACEs for share: - 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 - +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 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 /home/bar. The share is accessed via the share name foo: - - /home/bar - no + +/home/bar +no @@ -124,11 +124,11 @@ the only write access permitted is via calls to open, write to and close a spool file. The guest ok parameter means access will be permitted as the default guest user (specified elsewhere): - - /usr/spool/public - yes - yes - yes + +/usr/spool/public +yes +yes +yes @@ -358,8 +358,8 @@ chmod 1770 /usr/local/samba/lib/usershares Then add the parameters - /usr/local/samba/lib/usershares - 10 # (or the desired number of shares) +/usr/local/samba/lib/usershares +10 # (or the desired number of shares) to the global @@ -799,19 +799,18 @@ chmod 1770 /usr/local/samba/lib/usershares - [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 - +idmap config TRUSTED : backend = rid +idmap config TRUSTED : range = 6000000-6999999 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 @@ The format of an ACL is one or more entries separated by either commas or newlines. An ACL entry is one of the following: - + 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 @@ Straight forward use: - - /data/ice - aio_fork + +/data/ice +aio_fork 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 @@ Straight forward use: - - /data/ice - 1024 - 1024 - aio_linux + +/data/ice +1024 +1024 +aio_linux 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 @@ Straight forward use: - - /data/ice - 1024 - 1024 - aio_pthread + +/data/ice +1024 +1024 +aio_pthread 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: - - audit - LOCAL1 - NOTICE + +audit +LOCAL1 +NOTICE 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. - - btrfs - no - + +btrfs +no To use the experimental snapshot manipulation functionality provided by this module, it must be explicitly enabled, and @@ -106,15 +105,14 @@ - - fork - yes - registry - - - btrfs shadow_copy - yes - + +fork +yes +registry + + +btrfs shadow_copy +yes 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: - - cacheprime - 1M + +cacheprime +1M 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: - - CP932 - CP932 - cap + +CP932 +CP932 +cap 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: - - /data/cad - catia - 0x22:0xa8 + +/data/cad +catia +0x22:0xa8 Perform comprehensive mapping of common Catia filename characters: - - /data/cad - catia - 0x22:0xa8,0x2a:0xa4,0x2f:0xf8,0x3a:0xf7,0x3c:0xab,0x3e:0xbb,0x3f:0xbf,0x5c:0xff,0x7c:0xa6 + +/data/cad +catia +0x22:0xa8,0x2a:0xa4,0x2f:0xf8,0x3a:0xf7,0x3c:0xab,0x3e:0xbb,0x3f:0xbf,0x5c:0xff,0x7c:0xa6 Server-side filename to be translated (Note that the path delimiter "/" is not used here): @@ -105,10 +105,10 @@ A NOT working example: - - /data/cad - catia - 0x3a:0x5f + +/data/cad +catia +0x3a:0x5f Here the colon ":" is mapped to the underscore "_". 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 @@ - - ceph - + +ceph 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 @@ Synchronize the file data on the [precious] share after every 512 kilobytes (524288 bytes) of data is written: - - /data/precious - commit - 512K + +/data/precious +commit +512K 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: - - /data/mounts - crossrename - 50 + +/data/mounts +crossrename +50 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: - - default_quota - 65535 - yes + +default_quota +65535 +yes 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 @@ Sort directories for all shares: - - dirsort + +dirsort 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 @@ EXAMPLES - - /profiles - fake_perms + +/profiles +fake_perms 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 @@ fsid algorithm: - - fileid - fsid + +fileid +fsid 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 @@ EXAMPLES - - catia fruit streams_xattr - file - netatalk - netatalk - native + +catia fruit streams_xattr +file +netatalk +netatalk +native 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: - smbd_audit: PREFIX|OPERATION|RESULT|FILE - +smbd_audit: PREFIX|OPERATION|RESULT|FILE The record fields are: @@ -235,14 +234,14 @@ on failures: - - /data/records - full_audit - %u|%I - open opendir - all !open - LOCAL7 - ALERT + +/data/records +full_audit +%u|%I +open opendir +all !open +LOCAL7 +ALERT 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 @@ - - glusterfs - /relative/base/path - gv0 - no - + +glusterfs +/relative/base/path +gv0 +no Note that since vfs_glusterfs 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 @@ A GPFS mount can be exported via Samba as follows : - - gpfs - /test/gpfs_mount - special - merge + +gpfs +/test/gpfs_mount +special +merge 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 @@ Add syncops functionality for [share]: - - linux_xfs_sgid + +linux_xfs_sgid 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 @@ Enable media_harmony for Mac and Windows clients: - - /avid - media_harmony - no - - /avid - media_harmony - no - /.DS_Store/._@/.Trash@/.Spotlight@/.hidden/.hotfiles@/.vol/ - yes + +/avid +media_harmony +no + +/avid +media_harmony +no +/.DS_Store/._@/.Trash@/.Spotlight@/.hidden/.hotfiles@/.vol/ +yes Create the files that will allow users david and susan to control their own Avid database refreshes: - 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' Trigger an Avid database refresh for user david: - 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' 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 @@ Hide .AppleDouble files on the [data] share: - - netatalk + +netatalk 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 @@ Mark all files in a share as offline: - - offline + +offline 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): - - /data/frames - prealloc - 4M + +/data/frames +prealloc +4M 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 @@ EXAMPLES - - readahead + +readahead 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 @@ Mark all shares read only: - - readonly + +readonly Mark the [backup] share as read only during business hours: - - /readonly - readonly - readonly:period = "today 9:00","today 17:00" + +/readonly +readonly +readonly:period = "today 9:00","today 17:00" 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 @@ - - /data/share - recycle - .recycle - yes - yes + +/data/share +recycle +.recycle +yes +yes 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 @@ date 1 command: - TZ=GMT date +@GMT-%Y.%m.%d-%H.%M.%S - +TZ=GMT date +@GMT-%Y.%m.%d-%H.%M.%S @@ -78,8 +77,8 @@ Add shadow copy support to user home directories: - - shadow_copy + +shadow_copy 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 @@ date 1 command: - TZ=GMT date +@GMT-%Y.%m.%d-%H.%M.%S - +TZ=GMT date +@GMT-%Y.%m.%d-%H.%M.%S @@ -448,11 +447,11 @@ Add shadow copy support to user home directories: - - shadow_copy2 - /data/snapshots - /data/home - desc + +shadow_copy2 +/data/snapshots +/data/home +desc 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 @@ CONFIGURATION - - shell_snap - - snap_check_path.sh - - snap_create.sh - - snap_delete.sh - + +shell_snap +snap_check_path.sh +snap_create.sh +snap_delete.sh Samba's FSRVP server must be configured in the [global] section: - - fork - yes - registry - + +fork +yes +registry 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 @@ - - snapper - + +snapper For remote snapshot creation and deletion, Samba's FSRVP @@ -69,11 +68,10 @@ - - fork - yes - registry - + +fork +yes +registry 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 @@ EXAMPLES - - streams_depot + +streams_depot 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 @@ EXAMPLES - - streams_xattr + +streams_xattr 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 @@ Add syncops functionality for [share]: - - /data/share - syncops - no + +/data/share +syncops +no 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 @@ This would log VFS calls that take longer than 3 seconds: - - /test/sample_share - time_audit - 3000 + +/test/sample_share +time_audit +3000 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 @@ A GPFS mount with TSM support can be exported via Samba as follows: - - tsmsm gpfs - /test/gpfs_mount + +tsmsm gpfs +/test/gpfs_mount 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 @@ Enable unityed_media for Mac and Windows clients: - - /avid - unityed_media - - /avid - unityed_media - /.DS_Store/._@/.Trash@/.Spotlight@/.hidden/.hotfiles@/.vol/ - yes + +/avid +unityed_media + +/avid +unityed_media +/.DS_Store/._@/.Trash@/.Spotlight@/.hidden/.hotfiles@/.vol/ +yes 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): - - worm - 300 + +worm +300 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 @@ A ZFS mount can be exported via Samba as follows : - - zfsacl - /test/zfs_mount - special - merge + +zfsacl +/test/zfs_mount +special +merge