[Pkg-samba-maint] r4206 - in trunk/samba: . docs/manpages docs-xml/manpages-3 examples/VFS librpc/idl packaging/RHEL packaging/RHEL-CTDB source3 source3/auth source3/client source3/include source3/lib source3/librpc/gen_ndr source3/modules source3/passdb source3/printing source3/rpc_server/samr source3/rpc_server/spoolss source3/selftest source3/smbd source3/winbindd

idd-guest at alioth.debian.org idd-guest at alioth.debian.org
Mon Mar 18 18:43:44 UTC 2013


Author: idd-guest
Date: 2013-03-18 18:43:43 +0000 (Mon, 18 Mar 2013)
New Revision: 4206

Added:
   trunk/samba/docs-xml/manpages-3/dbwrap_tool.1.xml
   trunk/samba/docs/manpages/dbwrap_tool.1
Modified:
   trunk/samba/WHATSNEW.txt
   trunk/samba/docs-xml/manpages-3/vfs_catia.8.xml
   trunk/samba/docs/manpages/eventlogadm.8
   trunk/samba/docs/manpages/findsmb.1
   trunk/samba/docs/manpages/idmap_ad.8
   trunk/samba/docs/manpages/idmap_adex.8
   trunk/samba/docs/manpages/idmap_autorid.8
   trunk/samba/docs/manpages/idmap_hash.8
   trunk/samba/docs/manpages/idmap_ldap.8
   trunk/samba/docs/manpages/idmap_nss.8
   trunk/samba/docs/manpages/idmap_rid.8
   trunk/samba/docs/manpages/idmap_tdb.8
   trunk/samba/docs/manpages/idmap_tdb2.8
   trunk/samba/docs/manpages/libsmbclient.7
   trunk/samba/docs/manpages/lmhosts.5
   trunk/samba/docs/manpages/log2pcap.1
   trunk/samba/docs/manpages/net.8
   trunk/samba/docs/manpages/nmbd.8
   trunk/samba/docs/manpages/nmblookup.1
   trunk/samba/docs/manpages/ntlm_auth.1
   trunk/samba/docs/manpages/pam_winbind.8
   trunk/samba/docs/manpages/pam_winbind.conf.5
   trunk/samba/docs/manpages/pdbedit.8
   trunk/samba/docs/manpages/profiles.1
   trunk/samba/docs/manpages/rpcclient.1
   trunk/samba/docs/manpages/samba.7
   trunk/samba/docs/manpages/sharesec.1
   trunk/samba/docs/manpages/smb.conf.5
   trunk/samba/docs/manpages/smbcacls.1
   trunk/samba/docs/manpages/smbclient.1
   trunk/samba/docs/manpages/smbcontrol.1
   trunk/samba/docs/manpages/smbcquotas.1
   trunk/samba/docs/manpages/smbd.8
   trunk/samba/docs/manpages/smbget.1
   trunk/samba/docs/manpages/smbgetrc.5
   trunk/samba/docs/manpages/smbpasswd.5
   trunk/samba/docs/manpages/smbpasswd.8
   trunk/samba/docs/manpages/smbspool.8
   trunk/samba/docs/manpages/smbstatus.1
   trunk/samba/docs/manpages/smbta-util.8
   trunk/samba/docs/manpages/smbtar.1
   trunk/samba/docs/manpages/smbtree.1
   trunk/samba/docs/manpages/swat.8
   trunk/samba/docs/manpages/tdbbackup.8
   trunk/samba/docs/manpages/tdbdump.8
   trunk/samba/docs/manpages/tdbtool.8
   trunk/samba/docs/manpages/testparm.1
   trunk/samba/docs/manpages/vfs_acl_tdb.8
   trunk/samba/docs/manpages/vfs_acl_xattr.8
   trunk/samba/docs/manpages/vfs_aio_fork.8
   trunk/samba/docs/manpages/vfs_aio_pthread.8
   trunk/samba/docs/manpages/vfs_audit.8
   trunk/samba/docs/manpages/vfs_cacheprime.8
   trunk/samba/docs/manpages/vfs_cap.8
   trunk/samba/docs/manpages/vfs_catia.8
   trunk/samba/docs/manpages/vfs_commit.8
   trunk/samba/docs/manpages/vfs_crossrename.8
   trunk/samba/docs/manpages/vfs_default_quota.8
   trunk/samba/docs/manpages/vfs_dirsort.8
   trunk/samba/docs/manpages/vfs_extd_audit.8
   trunk/samba/docs/manpages/vfs_fake_perms.8
   trunk/samba/docs/manpages/vfs_fileid.8
   trunk/samba/docs/manpages/vfs_full_audit.8
   trunk/samba/docs/manpages/vfs_gpfs.8
   trunk/samba/docs/manpages/vfs_netatalk.8
   trunk/samba/docs/manpages/vfs_notify_fam.8
   trunk/samba/docs/manpages/vfs_prealloc.8
   trunk/samba/docs/manpages/vfs_preopen.8
   trunk/samba/docs/manpages/vfs_readahead.8
   trunk/samba/docs/manpages/vfs_readonly.8
   trunk/samba/docs/manpages/vfs_recycle.8
   trunk/samba/docs/manpages/vfs_scannedonly.8
   trunk/samba/docs/manpages/vfs_shadow_copy.8
   trunk/samba/docs/manpages/vfs_shadow_copy2.8
   trunk/samba/docs/manpages/vfs_smb_traffic_analyzer.8
   trunk/samba/docs/manpages/vfs_streams_depot.8
   trunk/samba/docs/manpages/vfs_streams_xattr.8
   trunk/samba/docs/manpages/vfs_time_audit.8
   trunk/samba/docs/manpages/vfs_xattr_tdb.8
   trunk/samba/docs/manpages/vfstest.1
   trunk/samba/docs/manpages/wbinfo.1
   trunk/samba/docs/manpages/winbind_krb5_locator.7
   trunk/samba/docs/manpages/winbindd.8
   trunk/samba/examples/VFS/configure
   trunk/samba/librpc/idl/spoolss.idl
   trunk/samba/packaging/RHEL-CTDB/samba.spec
   trunk/samba/packaging/RHEL/makerpms.sh
   trunk/samba/packaging/RHEL/samba.spec
   trunk/samba/source3/VERSION
   trunk/samba/source3/auth/auth_util.c
   trunk/samba/source3/auth/server_info.c
   trunk/samba/source3/client/client.c
   trunk/samba/source3/configure
   trunk/samba/source3/configure.in
   trunk/samba/source3/include/config.h.in
   trunk/samba/source3/include/version.h
   trunk/samba/source3/lib/util_file.c
   trunk/samba/source3/librpc/gen_ndr/ndr_spoolss.c
   trunk/samba/source3/librpc/gen_ndr/py_spoolss.c
   trunk/samba/source3/librpc/gen_ndr/spoolss.h
   trunk/samba/source3/modules/vfs_catia.c
   trunk/samba/source3/passdb/pdb_smbpasswd.c
   trunk/samba/source3/printing/nt_printing_ads.c
   trunk/samba/source3/rpc_server/samr/srv_samr_chgpasswd.c
   trunk/samba/source3/rpc_server/spoolss/srv_spoolss_nt.c
   trunk/samba/source3/selftest/skip
   trunk/samba/source3/smbd/globals.h
   trunk/samba/source3/smbd/msdfs.c
   trunk/samba/source3/smbd/reply.c
   trunk/samba/source3/smbd/sesssetup.c
   trunk/samba/source3/smbd/smb2_getinfo.c
   trunk/samba/source3/smbd/smb2_server.c
   trunk/samba/source3/smbd/trans2.c
   trunk/samba/source3/winbindd/winbindd_cache.c
   trunk/samba/source3/winbindd/winbindd_cm.c
   trunk/samba/source3/wscript
Log:
merge upstream 3.6.13

Modified: trunk/samba/WHATSNEW.txt
===================================================================
--- trunk/samba/WHATSNEW.txt	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/WHATSNEW.txt	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,4 +1,103 @@
                    ==============================
+                   Release Notes for Samba 3.6.13
+                           March 18, 2013
+                   ==============================
+
+
+This is is the latest stable release of Samba 3.6.
+
+Major enhancements in Samba 3.6.13 include:
+
+o  Fix two resource leaks in winbindd (bug #9684).
+o  Unlink after open causes smbd to panic (bug #9571).
+
+
+Changes since 3.6.12:
+--------------------
+
+o   Jeremy Allison <jra at samba.org>
+    * BUG 9519: Samba returns unexpected error on SMB posix open.
+    * BUG 9585: Samba 3.6.x not correctly signing any but the last response in
+      a compound request/response.
+    * BUG 9586: smbd[29175]: disk_free: sys_popen() failed" message logged in
+      /var/log/messages many times.
+    * BUG 9587: Archive flag is always set on directories.
+    * BUG 9588: ACLs are not inherited to directories for DFS shares.
+    * BUG 9637: Renaming directories as guest user in security share mode
+      doesn't work.
+
+
+o   Björn Baumbach <bb at sernet.de>
+    * BUG 9568: Add dbwrap_tool.1 manual page.
+
+
+o   Ira Cooper <ira at samba.org>
+    * BUG 9646: Make SMB2_GETINFO multi-volume aware.
+
+
+o   Günther Deschner <gd at samba.org>
+    * BUG 9474: Downgrade v4 printer driver requests to v3.
+
+
+o   David Disseldorp <ddiss at samba.org>
+    * BUG 9378: Add extra attributes for AD printer publishing.
+    * BUG 9658: Fix initial large PAC sess setup response.
+
+
+o   Björn Jacke <bj at sernet.de>
+    * BUG 7825: Fix GNU ld version detection with
+      old gcc releases.
+
+
+o   Daniel Kobras <d.kobras at science-computing.de>
+    * BUG 9039: 'map untrusted to domain' treats WORKSTATION as bogus domain.
+
+
+o   Guenter Kukkukk <kukks at samba.org>
+    * BUG 9701: Fix vfs_catia module.
+
+
+o   Volker Lendecke <vl at samba.org>
+    * BUG 9541: Add support for posix_openpt.
+
+
+o   Stefan Metzmacher <metze at samba.org>
+    * Bug 9625: wbcAuthenticateEx gives unix times.
+
+
+o   Andreas Schneider <asn at samba.org>
+    * BUG 9574: Fix a possible null pointer dereference in spoolss.
+    * BUG 9684: Fix two resource leaks in winbindd.
+    * BUG 9686: Fix a possible buffer overrun in pdb_smbpasswd.
+
+
+o   Pavel Shilovsky <piastry at etersoft.ru>
+    * Bug #9571: Unlink after open causes smbd to panic.
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 3.6 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+Release notes for older releases follow:
+----------------------------------------
+
+                   ==============================
                    Release Notes for Samba 3.6.12
                           January 30, 2013
                    ==============================
@@ -60,9 +159,10 @@
 == The Samba Team
 ======================================================================
 
-Release notes for older releases follow:
-----------------------------------------
 
+----------------------------------------------------------------------
+
+
                    ==============================
                    Release Notes for Samba 3.6.11
                          January 21, 2013

Copied: trunk/samba/docs/manpages/dbwrap_tool.1 (from rev 4205, tags/samba/upstream_3.6.13/docs/manpages/dbwrap_tool.1)
===================================================================
--- trunk/samba/docs/manpages/dbwrap_tool.1	                        (rev 0)
+++ trunk/samba/docs/manpages/dbwrap_tool.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -0,0 +1,201 @@
+'\" t
+.\"     Title: dbwrap_tool
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
+.\"    Manual: System Administration tools
+.\"    Source: Samba 3.6
+.\"  Language: English
+.\"
+.TH "DBWRAP_TOOL" "1" "03/11/2013" "Samba 3\&.6" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+dbwrap_tool \- low level TDB/CTDB manipulation tool using the dbwrap interface
+.SH "SYNOPSIS"
+.HP \w'\ 'u
+dbwrap_tool {<database>} {<operation>} [<key>\ [<type>\ [<value>]\ ]]
+.SH "DESCRIPTION"
+.PP
+This tool is part of the
+\fBsamba\fR(7)
+suite\&.
+.PP
+The dbwrap_tool program is used to read and manipulate TDB/CTDB databases using the dbwrap interface\&.
+.PP
+The following database operations are available:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+fetch: fetch a record
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+store: create or modify a record
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+delete: remove a record
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+erase: remove all records
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+listkeys: list all available records
+.RE
+.sp
+.RE
+.PP
+The following types are available:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+int32: signed 32bit integer
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+uint32: unsigned 32bit integer
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+string: "hello world"
+.RE
+.sp
+.RE
+.SH "OPTIONS"
+.PP
+None\&.
+.SH "COMMANDS"
+.SS "fetch"
+.HP \w'\ 'u
+dbwrap_tool <database> fetch <key> <type>
+		
+.SS "store"
+.HP \w'\ 'u
+dbwrap_tool <database> store <key> <type> <value>
+		
+.SS "delete"
+.HP \w'\ 'u
+dbwrap_tool <database> delete <key>
+		
+.SS "erase"
+.HP \w'\ 'u
+dbwrap_tool <database> erase
+		
+.SS "listkeys"
+.HP \w'\ 'u
+dbwrap_tool <database> listkeys
+		
+.SH "EXAMPLES"
+.PP
+List all keys from winbindd_idmap\&.tdb
+.RS 4
+dbwrap_tool
+winbindd_idmap\&.tdb listkeys
+.RE
+.PP
+Fetch record with key "USER HWM" as uint32
+.RS 4
+dbwrap_tool
+winbindd_idmap\&.tdb fetch "USER HWM" uint32
+.RE
+.PP
+Remove record with key "USER HWM"
+.RS 4
+dbwrap_tool
+winbindd_idmap\&.tdb remove "USER HWM"
+.RE
+.PP
+Store and overwrite record "USER HWM" with value 214
+.RS 4
+dbwrap_tool
+winbindd_idmap\&.tdb store "USER HWM" uint32 214
+.RE
+.SH "NOTES"
+.PP
+Use with caution!
+.SH "VERSION"
+.PP
+This man page is correct for version 3 of the Samba suite\&.
+.SH "SEE ALSO"
+.PP
+\fBsmbd\fR(8),
+\fBsamba\fR(7)
+.SH "AUTHOR"
+.PP
+The original Samba software and related utilities 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\&.
+.PP
+The dbwrap_tool manpage was written by Bjoern Baumbach\&.

Modified: trunk/samba/docs/manpages/eventlogadm.8
===================================================================
--- trunk/samba/docs/manpages/eventlogadm.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/eventlogadm.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: eventlogadm
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "EVENTLOGADM" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "EVENTLOGADM" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/findsmb.1
===================================================================
--- trunk/samba/docs/manpages/findsmb.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/findsmb.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: findsmb
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "FINDSMB" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "FINDSMB" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -68,7 +77,7 @@
 nmblookup
 for any name: IP address, NetBIOS name, Workgroup name, operating system, and SMB server version\&.
 .PP
-There will be a \'+\' in front of the workgroup name for machines that are local master browsers for that workgroup\&. There will be an \'*\' in front of the workgroup name for machines that are the domain master browser for that workgroup\&. Machines that are running Windows for Workgroups, Windows 95 or Windows 98 will not show any information about the operating system or server version\&.
+There will be a \*(Aq+\*(Aq in front of the workgroup name for machines that are local master browsers for that workgroup\&. There will be an \*(Aq*\*(Aq in front of the workgroup name for machines that are the domain master browser for that workgroup\&. Machines that are running Windows for Workgroups, Windows 95 or Windows 98 will not show any information about the operating system or server version\&.
 .PP
 The command with
 \fB\-r\fR

Modified: trunk/samba/docs/manpages/idmap_ad.8
===================================================================
--- trunk/samba/docs/manpages/idmap_ad.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/idmap_ad.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: idmap_ad
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_AD" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_AD" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -19,7 +28,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-idmap_ad \- Samba\'s idmap_ad Backend for Winbind
+idmap_ad \- Samba\*(Aqs idmap_ad Backend for Winbind
 .SH "DESCRIPTION"
 .PP
 The idmap_ad plugin provides a way for Winbind to read id mappings from an AD server that uses RFC2307/SFU schema extensions\&. This module implements only the "idmap" API, and is READONLY\&. Mappings must be provided in advance by the administrator by adding the posixAccount/posixGroup classes and relative attribute/value pairs to the user and group objects in the AD\&.

Modified: trunk/samba/docs/manpages/idmap_adex.8
===================================================================
--- trunk/samba/docs/manpages/idmap_adex.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/idmap_adex.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: idmap_adex
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_ADEX" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_ADEX" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -19,7 +28,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-idmap_adex \- Samba\'s idmap_adex Backend for Winbind
+idmap_adex \- Samba\*(Aqs idmap_adex Backend for Winbind
 .SH "DESCRIPTION"
 .PP
 The idmap_adex plugin provides a way for Winbind to read id mappings from an AD server that uses RFC2307 schema extensions\&. This module implements both the idmap and nss_info APIs and supports domain trustes as well as two\-way cross forest trusts\&. It is a read\-only plugin requiring that the administrator provide mappings in advance by adding the POSIX attribute information to the users and groups objects in AD\&. The most common means of doing this is using "Identity Services for Unix" support on Windows 2003 R2 and later\&.

Modified: trunk/samba/docs/manpages/idmap_autorid.8
===================================================================
--- trunk/samba/docs/manpages/idmap_autorid.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/idmap_autorid.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: idmap_autorid
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_AUTORID" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_AUTORID" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -19,7 +28,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-idmap_autorid \- Samba\'s idmap_autorid Backend for Winbind
+idmap_autorid \- Samba\*(Aqs idmap_autorid Backend for Winbind
 .SH "DESCRIPTION"
 .PP
 The idmap_autorid backend provides a way to use an algorithmic mapping scheme to map UIDs/GIDs and SIDs that is more deterministic than idmap_tdb and easier to configure than idmap_rid\&.

Modified: trunk/samba/docs/manpages/idmap_hash.8
===================================================================
--- trunk/samba/docs/manpages/idmap_hash.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/idmap_hash.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: idmap_hash
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_HASH" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_HASH" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -19,7 +28,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-idmap_hash \- Samba\'s idmap_hash Backend for Winbind
+idmap_hash \- Samba\*(Aqs idmap_hash Backend for Winbind
 .SH "DESCRIPTION"
 .PP
 The idmap_hash plugin implements a hashing algorithm used to map SIDs for domain users and groups to 31\-bit uids and gids, respectively\&. This plugin also implements the nss_info API and can be used to support a local name mapping files if enabled via the "winbind normalize names" and "winbind nss info" parameters in smb\&.conf\&.

Modified: trunk/samba/docs/manpages/idmap_ldap.8
===================================================================
--- trunk/samba/docs/manpages/idmap_ldap.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/idmap_ldap.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: idmap_ldap
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_LDAP" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_LDAP" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -19,7 +28,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-idmap_ldap \- Samba\'s idmap_ldap Backend for Winbind
+idmap_ldap \- Samba\*(Aqs idmap_ldap Backend for Winbind
 .SH "DESCRIPTION"
 .PP
 The idmap_ldap plugin provides a means for Winbind to store and retrieve SID/uid/gid mapping tables in an LDAP directory service\&.
@@ -49,7 +58,7 @@
 .RE
 .SH "EXAMPLES"
 .PP
-The following example shows how an ldap directory is used as the default idmap backend\&. It also configures the idmap range and base directory suffix\&. The secret for the ldap_user_dn has to be set with "net idmap secret \'*\' password"\&.
+The following example shows how an ldap directory is used as the default idmap backend\&. It also configures the idmap range and base directory suffix\&. The secret for the ldap_user_dn has to be set with "net idmap secret \*(Aq*\*(Aq password"\&.
 .sp
 .if n \{\
 .RS 4

Modified: trunk/samba/docs/manpages/idmap_nss.8
===================================================================
--- trunk/samba/docs/manpages/idmap_nss.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/idmap_nss.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: idmap_nss
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_NSS" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_NSS" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -19,7 +28,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-idmap_nss \- Samba\'s idmap_nss Backend for Winbind
+idmap_nss \- Samba\*(Aqs idmap_nss Backend for Winbind
 .SH "DESCRIPTION"
 .PP
 The idmap_nss plugin provides a means to map Unix users and groups to Windows accounts and obsoletes the "winbind trusted domains only" smb\&.conf option\&. This provides a simple means of ensuring that the SID for a Unix user named jsmith is reported as the one assigned to DOMAIN\ejsmith which is necessary for reporting ACLs on files and printers stored on a Samba member server\&.

Modified: trunk/samba/docs/manpages/idmap_rid.8
===================================================================
--- trunk/samba/docs/manpages/idmap_rid.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/idmap_rid.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: idmap_rid
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_RID" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_RID" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -19,7 +28,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-idmap_rid \- Samba\'s idmap_rid Backend for Winbind
+idmap_rid \- Samba\*(Aqs idmap_rid Backend for Winbind
 .SH "DESCRIPTION"
 .PP
 The idmap_rid backend provides a way to use an algorithmic mapping scheme to map UIDs/GIDs and SIDs\&. No database is required in this case as the mapping is deterministic\&.

Modified: trunk/samba/docs/manpages/idmap_tdb.8
===================================================================
--- trunk/samba/docs/manpages/idmap_tdb.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/idmap_tdb.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: idmap_tdb
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_TDB" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -19,7 +28,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-idmap_tdb \- Samba\'s idmap_tdb Backend for Winbind
+idmap_tdb \- Samba\*(Aqs idmap_tdb Backend for Winbind
 .SH "DESCRIPTION"
 .PP
 The idmap_tdb plugin is the default backend used by winbindd for storing SID/uid/gid mapping tables\&.

Modified: trunk/samba/docs/manpages/idmap_tdb2.8
===================================================================
--- trunk/samba/docs/manpages/idmap_tdb2.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/idmap_tdb2.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: idmap_tdb2
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB2" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_TDB2" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -19,7 +28,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-idmap_tdb2 \- Samba\'s idmap_tdb2 Backend for Winbind
+idmap_tdb2 \- Samba\*(Aqs idmap_tdb2 Backend for Winbind
 .SH "DESCRIPTION"
 .PP
 The idmap_tdb2 plugin is a substitute for the default idmap_tdb backend used by winbindd for storing SID/uid/gid mapping tables in clustered environments with Samba and CTDB\&.

Modified: trunk/samba/docs/manpages/libsmbclient.7
===================================================================
--- trunk/samba/docs/manpages/libsmbclient.7	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/libsmbclient.7	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: libsmbclient
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: 7
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "LIBSMBCLIENT" "7" "01/18/2013" "Samba 3\&.6" "7"
+.TH "LIBSMBCLIENT" "7" "03/11/2013" "Samba 3\&.6" "7"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -33,7 +42,7 @@
 .PP
 
 libsmbclient
-is a library toolset that permits applications to manipulate CIFS/SMB network resources using many of the standards POSIX functions available for manipulating local UNIX/Linux files\&. It permits much more than just browsing, files can be opened and read or written, permissions changed, file times modified, attributes and ACL\'s can be manipulated, and so on\&. Of course, its functionality includes all the capabilities commonly called browsing\&.
+is a library toolset that permits applications to manipulate CIFS/SMB network resources using many of the standards POSIX functions available for manipulating local UNIX/Linux files\&. It permits much more than just browsing, files can be opened and read or written, permissions changed, file times modified, attributes and ACL\*(Aqs can be manipulated, and so on\&. Of course, its functionality includes all the capabilities commonly called browsing\&.
 .PP
 
 libsmbclient

Modified: trunk/samba/docs/manpages/lmhosts.5
===================================================================
--- trunk/samba/docs/manpages/lmhosts.5	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/lmhosts.5	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: lmhosts
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "LMHOSTS" "5" "01/18/2013" "Samba 3\&.6" "File Formats and Conventions"
+.TH "LMHOSTS" "5" "03/11/2013" "Samba 3\&.6" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -40,7 +49,7 @@
 file format, except that the hostname component must correspond to the NetBIOS naming format\&.
 .SH "FILE FORMAT"
 .PP
-It is an ASCII file containing one line for NetBIOS name\&. The two fields on each line are separated from each other by white space\&. Any entry beginning with \'#\' is ignored\&. Each line in the lmhosts file contains the following information:
+It is an ASCII file containing one line for NetBIOS name\&. The two fields on each line are separated from each other by white space\&. Any entry beginning with \*(Aq#\*(Aq is ignored\&. Each line in the lmhosts file contains the following information:
 .sp
 .RS 4
 .ie n \{\
@@ -61,9 +70,9 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-NetBIOS Name \- This name format is a maximum fifteen character host name, with an optional trailing \'#\' character followed by the NetBIOS name type as two hexadecimal digits\&.
+NetBIOS Name \- This name format is a maximum fifteen character host name, with an optional trailing \*(Aq#\*(Aq character followed by the NetBIOS name type as two hexadecimal digits\&.
 .sp
-If the trailing \'#\' is omitted then the given IP address will be returned for all names that match the given name, whatever the NetBIOS name type in the lookup\&.
+If the trailing \*(Aq#\*(Aq is omitted then the given IP address will be returned for all names that match the given name, whatever the NetBIOS name type in the lookup\&.
 .RE
 .sp
 .RE

Modified: trunk/samba/docs/manpages/log2pcap.1
===================================================================
--- trunk/samba/docs/manpages/log2pcap.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/log2pcap.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: log2pcap
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "LOG2PCAP" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "LOG2PCAP" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -103,7 +112,7 @@
 .PP
 Only SMB data is extracted from the samba logs, no LDAP, NetBIOS lookup or other data\&.
 .PP
-The generated TCP and IP headers don\'t contain a valid checksum\&.
+The generated TCP and IP headers don\*(Aqt contain a valid checksum\&.
 .SH "SEE ALSO"
 .PP
 \fBtext2pcap\fR(1),

Modified: trunk/samba/docs/manpages/net.8
===================================================================
--- trunk/samba/docs/manpages/net.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/net.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: net
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NET" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "NET" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -152,7 +161,7 @@
 .PP
 [UPN] (ADS only) set the principalname attribute during the join\&. The default format is host/netbiosname at REALM\&.
 .PP
-[OU] (ADS only) Precreate the computer account in a specific OU\&. The OU string reads from top to bottom without RDNs, and is delimited by a \'/\'\&. Please note that \'\e\' is used for escape by both the shell and ldap, so it may need to be doubled or quadrupled to pass through, and it is not used as a delimiter\&.
+[OU] (ADS only) Precreate the computer account in a specific OU\&. The OU string reads from top to bottom without RDNs, and is delimited by a \*(Aq/\*(Aq\&. Please note that \*(Aq\e\*(Aq is used for escape by both the shell and ldap, so it may need to be doubled or quadrupled to pass through, and it is not used as a delimiter\&.
 .SS "[RPC] OLDJOIN [options]"
 .PP
 Join a domain\&. Use the OLDJOIN option to join the domain using the old style of domain joining \- you need to create a trust account in server manager first\&.
@@ -347,7 +356,7 @@
 \fIREALM\fR\&. Defaults to local realm\&.
 .SS "LOOKUP DC [DOMAIN]"
 .PP
-Give IP\'s of Domain Controllers for specified
+Give IP\*(Aqs of Domain Controllers for specified
 \fI DOMAIN\fR\&. Defaults to local domain\&.
 .SS "LOOKUP MASTER DOMAIN"
 .PP
@@ -356,7 +365,7 @@
 or workgroup\&. Defaults to local domain\&.
 .SS "CACHE"
 .PP
-Samba uses a general caching interface called \'gencache\'\&. It can be controlled using \'NET CACHE\'\&.
+Samba uses a general caching interface called \*(Aqgencache\*(Aq\&. It can be controlled using \*(AqNET CACHE\*(Aq\&.
 .PP
 All the timeout parameters support the suffixes:
 .RS 4
@@ -460,7 +469,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-type \- Type of the group; either \'domain\', \'local\', or \'builtin\'
+type \- Type of the group; either \*(Aqdomain\*(Aq, \*(Aqlocal\*(Aq, or \*(Aqbuiltin\*(Aq
 .RE
 .sp
 .RS 4
@@ -521,7 +530,7 @@
 net groupmap list [verbose] [ntgroup=string] [sid=SID]
 .SS "MAXRID"
 .PP
-Prints out the highest RID currently in use on the local server (by the active \'passdb backend\')\&.
+Prints out the highest RID currently in use on the local server (by the active \*(Aqpassdb backend\*(Aq)\&.
 .SS "RPC INFO"
 .PP
 Print information about the domain of the remote server, such as domain name, domain sid and number of users and groups\&.
@@ -538,7 +547,7 @@
 \fIDOMAIN\fR\&. This is in fact a Samba account named
 \fIDOMAIN$\fR
 with the account flag
-\fB\'I\'\fR
+\fB\*(AqI\*(Aq\fR
 (interdomain trust account)\&. This is required for incoming trusts to work\&. It makes Samba be a trusted domain of the foreign (trusting) domain\&. Users of the Samba domain will be made available in the foreign domain\&. If the command is used against localhost it has the same effect as
 smbpasswd \-a \-i DOMAIN\&. Please note that both commands expect a appropriate UNIX account\&.
 .SS "RPC TRUSTDOM DEL DOMAIN"
@@ -548,7 +557,7 @@
 smbpasswd \-x DOMAIN$\&.
 .SS "RPC TRUSTDOM ESTABLISH DOMAIN"
 .PP
-Establish a trust relationship to a trusted domain\&. Interdomain account must already be created on the remote PDC\&. This is required for outgoing trusts to work\&. It makes Samba be a trusting domain of a foreign (trusted) domain\&. Users of the foreign domain will be made available in our domain\&. You\'ll need winbind and a working idmap config to make them appear in your system\&.
+Establish a trust relationship to a trusted domain\&. Interdomain account must already be created on the remote PDC\&. This is required for outgoing trusts to work\&. It makes Samba be a trusting domain of a foreign (trusted) domain\&. Users of the foreign domain will be made available in our domain\&. You\*(Aqll need winbind and a working idmap config to make them appear in your system\&.
 .SS "RPC TRUSTDOM REVOKE DOMAIN"
 .PP
 Abandon relationship to trusted domain
@@ -690,10 +699,10 @@
 .SS ""
 .SS "RPC RIGHTS"
 .PP
-This subcommand is used to view and manage Samba\'s rights assignments (also referred to as privileges)\&. There are three options currently available:
+This subcommand is used to view and manage Samba\*(Aqs rights assignments (also referred to as privileges)\&. There are three options currently available:
 \fIlist\fR,
 \fIgrant\fR, and
-\fIrevoke\fR\&. More details on Samba\'s privilege model and its use can be found in the Samba\-HOWTO\-Collection\&.
+\fIrevoke\fR\&. More details on Samba\*(Aqs privilege model and its use can be found in the Samba\-HOWTO\-Collection\&.
 .SS "RPC ABORTSHUTDOWN"
 .PP
 Abort the shutdown of a remote server\&.
@@ -761,13 +770,13 @@
 Perform a raw LDAP search on a ADS server and dump the results\&. The expression is a standard LDAP search expression, and the attributes are a list of LDAP fields to show in the results\&.
 .PP
 Example:
-\fBnet ads search \'(objectCategory=group)\' sAMAccountName\fR
+\fBnet ads search \*(Aq(objectCategory=group)\*(Aq sAMAccountName\fR
 .SS "ADS DN \fIDN\fR \fI(attributes)\fR"
 .PP
 Perform a raw LDAP search on a ADS server and dump the results\&. The DN standard LDAP DN, and the attributes are a list of LDAP fields to show in the result\&.
 .PP
 Example:
-\fBnet ads dn \'CN=administrator,CN=Users,DC=my,DC=domain\' SAMAccountName\fR
+\fBnet ads dn \*(AqCN=administrator,CN=Users,DC=my,DC=domain\*(Aq SAMAccountName\fR
 .SS "ADS WORKGROUP"
 .PP
 Print out workgroup name for specified kerberos realm\&.
@@ -900,7 +909,7 @@
 .PP
 \-T|\-\-test
 .RS 4
-Dry run, show what changes would be made but don\'t touch anything\&.
+Dry run, show what changes would be made but don\*(Aqt touch anything\&.
 .RE
 .PP
 \-l|\-\-lock
@@ -983,14 +992,14 @@
 .PP
 Get info on user defined shares owned by the current user matching the given pattern, or all users\&.
 .PP
-net usershare info on its own dumps out info on the user defined shares that were created by the current user, or restricts them to share names that match the given wildcard pattern (\'*\' matches one or more characters, \'?\' matches only one character)\&. If the \'\-l\' or \'\-\-long\' option is also given, it prints out info on user defined shares created by other users\&.
+net usershare info on its own dumps out info on the user defined shares that were created by the current user, or restricts them to share names that match the given wildcard pattern (\*(Aq*\*(Aq matches one or more characters, \*(Aq?\*(Aq matches only one character)\&. If the \*(Aq\-l\*(Aq or \*(Aq\-\-long\*(Aq option is also given, it prints out info on user defined shares created by other users\&.
 .PP
 The information given about a share looks like: [foobar] path=/home/jeremy comment=testme usershare_acl=Everyone:F guest_ok=n And is a list of the current settings of the user defined share that can be modified by the "net usershare add" command\&.
 .SS "USERSHARE LIST [-l|--long] wildcard sharename"
 .PP
 List all the user defined shares owned by the current user matching the given pattern, or all users\&.
 .PP
-net usershare list on its own list out the names of the user defined shares that were created by the current user, or restricts the list to share names that match the given wildcard pattern (\'*\' matches one or more characters, \'?\' matches only one character)\&. If the \'\-l\' or \'\-\-long\' option is also given, it includes the names of user defined shares created by other users\&.
+net usershare list on its own list out the names of the user defined shares that were created by the current user, or restricts the list to share names that match the given wildcard pattern (\*(Aq*\*(Aq matches one or more characters, \*(Aq?\*(Aq matches only one character)\&. If the \*(Aq\-l\*(Aq or \*(Aq\-\-long\*(Aq option is also given, it includes the names of user defined shares created by other users\&.
 .SS "CONF"
 .PP
 Starting with version 3\&.2\&.0, a Samba server can be configured by data stored in registry\&. This configuration data can be edited with the new "net conf" commands\&.
@@ -1099,7 +1108,7 @@
 Delete the list of includes from the provided section (global or share)\&.
 .SS "REGISTRY"
 .PP
-Manipulate Samba\'s registry\&.
+Manipulate Samba\*(Aqs registry\&.
 .PP
 The registry commands are:
 .RS 4

Modified: trunk/samba/docs/manpages/nmbd.8
===================================================================
--- trunk/samba/docs/manpages/nmbd.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/nmbd.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: nmbd
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NMBD" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "NMBD" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -76,7 +85,7 @@
 supervise
 and
 svscan
-from Daniel J\&. Bernstein\'s
+from Daniel J\&. Bernstein\*(Aqs
 daemontools
 package, or the AIX process monitor\&.
 .RE
@@ -163,7 +172,7 @@
 .RS 4
 UDP port number is a positive integer value\&. This option changes the default UDP port number (normally 137) that
 nmbd
-responds to name queries on\&. Don\'t use this option unless you are an expert, in which case you won\'t need help!
+responds to name queries on\&. Don\*(Aqt use this option unless you are an expert, in which case you won\*(Aqt need help!
 .RE
 .SH "FILES"
 .PP
@@ -261,7 +270,7 @@
 \fBsmb.conf\fR(5),
 \fBsmbclient\fR(1),
 \fBtestparm\fR(1),
-\fBtestprns\fR(1), and the Internet RFC\'s
+\fBtestprns\fR(1), and the Internet RFC\*(Aqs
 rfc1001\&.txt,
 rfc1002\&.txt\&. In addition the CIFS (formerly SMB) specification is available as a link from the Web page
 http://samba\&.org/cifs/\&.

Modified: trunk/samba/docs/manpages/nmblookup.1
===================================================================
--- trunk/samba/docs/manpages/nmblookup.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/nmblookup.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: nmblookup
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NMBLOOKUP" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "NMBLOOKUP" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -41,7 +50,7 @@
 \fB0x1d\fR\&. If
 \fI name\fR
 is "\-" then it does a lookup on the special name
-\fB__MSBROWSE__\fR\&. Please note that in order to use the name "\-", you need to make sure "\-" isn\'t parsed as an argument, e\&.g\&. use :
+\fB__MSBROWSE__\fR\&. Please note that in order to use the name "\-", you need to make sure "\-" isn\*(Aqt parsed as an argument, e\&.g\&. use :
 \fBnmblookup \-M \-\- \-\fR\&.
 .RE
 .PP
@@ -173,7 +182,7 @@
 .PP
 name
 .RS 4
-This is the NetBIOS name being queried\&. Depending upon the previous options this may be a NetBIOS name or IP address\&. If a NetBIOS name then the different name types may be specified by appending \'#<type>\' to the name\&. This name may also be \'*\', which will return all registered names within a broadcast area\&.
+This is the NetBIOS name being queried\&. Depending upon the previous options this may be a NetBIOS name or IP address\&. If a NetBIOS name then the different name types may be specified by appending \*(Aq#<type>\*(Aq to the name\&. This name may also be \*(Aq*\*(Aq, which will return all registered names within a broadcast area\&.
 .RE
 .SH "EXAMPLES"
 .PP
@@ -184,11 +193,11 @@
 nmblookup
 must be called like this:
 .PP
-nmblookup \-U server \-R \'name\'
+nmblookup \-U server \-R \*(Aqname\*(Aq
 .PP
 For example, running :
 .PP
-nmblookup \-U samba\&.org \-R \'IRIX#1B\'
+nmblookup \-U samba\&.org \-R \*(AqIRIX#1B\*(Aq
 .PP
 would query the WINS server samba\&.org for the domain master browser (1B name type) for the IRIX workgroup\&.
 .SH "VERSION"

Modified: trunk/samba/docs/manpages/ntlm_auth.1
===================================================================
--- trunk/samba/docs/manpages/ntlm_auth.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/ntlm_auth.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: ntlm_auth
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NTLM_AUTH" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "NTLM_AUTH" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -19,7 +28,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-ntlm_auth \- tool to allow external access to Winbind\'s NTLM authentication function
+ntlm_auth \- tool to allow external access to Winbind\*(Aqs NTLM authentication function
 .SH "SYNOPSIS"
 .HP \w'\ 'u
 ntlm_auth [\-d\ debuglevel] [\-l\ logdir] [\-s\ <smb\ config\ file>]
@@ -54,17 +63,17 @@
 .PP
 squid\-2\&.4\-basic
 .RS 4
-Server\-side helper for use with Squid 2\&.4\'s basic (plaintext) authentication\&.
+Server\-side helper for use with Squid 2\&.4\*(Aqs basic (plaintext) authentication\&.
 .RE
 .PP
 squid\-2\&.5\-basic
 .RS 4
-Server\-side helper for use with Squid 2\&.5\'s basic (plaintext) authentication\&.
+Server\-side helper for use with Squid 2\&.5\*(Aqs basic (plaintext) authentication\&.
 .RE
 .PP
 squid\-2\&.5\-ntlmssp
 .RS 4
-Server\-side helper for use with Squid 2\&.5\'s NTLMSSP authentication\&.
+Server\-side helper for use with Squid 2\&.5\*(Aqs NTLMSSP authentication\&.
 .sp
 Requires access to the directory
 winbindd_privileged
@@ -77,7 +86,7 @@
 .PP
 ntlmssp\-client\-1
 .RS 4
-Client\-side helper for use with arbitrary external programs that may wish to use Samba\'s NTLMSSP authentication knowledge\&.
+Client\-side helper for use with arbitrary external programs that may wish to use Samba\*(Aqs NTLMSSP authentication knowledge\&.
 .sp
 This helper is a client, and as such may be run by any user\&. The protocol used is effectively the reverse of the previous protocol\&. A
 YR
@@ -102,7 +111,7 @@
 .PP
 ntlm\-server\-1
 .RS 4
-Server\-side helper protocol, intended for use by a RADIUS server or the \'winbind\' plugin for pppd, for the provision of MSCHAP and MSCHAPv2 authentication\&.
+Server\-side helper protocol, intended for use by a RADIUS server or the \*(Aqwinbind\*(Aq plugin for pppd, for the provision of MSCHAP and MSCHAPv2 authentication\&.
 .sp
 This protocol consists of lines in the form:
 Parameter: value
@@ -115,7 +124,7 @@
 .PP
 Username
 .RS 4
-The username, expected to be in Samba\'s
+The username, expected to be in Samba\*(Aqs
 \m[blue]\fBunix charset\fR\m[]\&.
 .PP
 Examples:
@@ -128,7 +137,7 @@
 .PP
 NT\-Domain
 .RS 4
-The user\'s domain, expected to be in Samba\'s
+The user\*(Aqs domain, expected to be in Samba\*(Aqs
 \m[blue]\fBunix charset\fR\m[]\&.
 .PP
 Examples:
@@ -141,7 +150,7 @@
 .PP
 Full\-Username
 .RS 4
-The fully qualified username, expected to be in Samba\'s
+The fully qualified username, expected to be in Samba\*(Aqs
 \m[blue]\fBunix charset\fR\m[]
 and qualified with the
 \m[blue]\fBwinbind separator\fR\m[]\&.
@@ -170,7 +179,7 @@
 .RS 4
 The 24 byte
 LANMAN Response
-value, calculated from the user\'s password and the supplied
+value, calculated from the user\*(Aqs password and the supplied
 LANMAN Challenge\&. Typically, this is provided over the network by a client wishing to authenticate\&.
 .PP
 Examples:
@@ -183,7 +192,7 @@
 .RS 4
 The >= 24 byte
 NT Response
-calculated from the user\'s password and the supplied
+calculated from the user\*(Aqs password and the supplied
 LANMAN Challenge\&. Typically, this is provided over the network by a client wishing to authenticate\&.
 .PP
 Examples:
@@ -194,7 +203,7 @@
 .PP
 Password
 .RS 4
-The user\'s password\&. This would be provided by a network client, if the helper is being used in a legacy situation that exposes plaintext passwords in this way\&.
+The user\*(Aqs password\&. This would be provided by a network client, if the helper is being used in a legacy situation that exposes plaintext passwords in this way\&.
 .PP
 Examples:
 .RS 4
@@ -274,7 +283,7 @@
 .PP
 \-\-password=PASSWORD
 .RS 4
-User\'s plaintext password
+User\*(Aqs plaintext password
 .sp
 If not specified on the command line, this is prompted for when required\&.
 .sp
@@ -388,15 +397,15 @@
 .RS 4
 .\}
 .nf
-auth_param ntlm program ntlm_auth \-\-helper\-protocol=squid\-2\&.5\-ntlmssp \-\-require\-membership\-of=\'WORKGROUP\eDomain Users\'
-auth_param basic program ntlm_auth \-\-helper\-protocol=squid\-2\&.5\-basic \-\-require\-membership\-of=\'WORKGROUP\eDomain Users\'
+auth_param ntlm program ntlm_auth \-\-helper\-protocol=squid\-2\&.5\-ntlmssp \-\-require\-membership\-of=\*(AqWORKGROUP\eDomain Users\*(Aq
+auth_param basic program ntlm_auth \-\-helper\-protocol=squid\-2\&.5\-basic \-\-require\-membership\-of=\*(AqWORKGROUP\eDomain Users\*(Aq
 .fi
 .if n \{\
 .RE
 .\}
 .SH "TROUBLESHOOTING"
 .PP
-If you\'re experiencing problems with authenticating Internet Explorer running under MS Windows 9X or Millennium Edition against ntlm_auth\'s NTLMSSP authentication helper (\-\-helper\-protocol=squid\-2\&.5\-ntlmssp), then please read
+If you\*(Aqre experiencing problems with authenticating Internet Explorer running under MS Windows 9X or Millennium Edition against ntlm_auth\*(Aqs NTLMSSP authentication helper (\-\-helper\-protocol=squid\-2\&.5\-ntlmssp), then please read
 the Microsoft Knowledge Base article #239869 and follow instructions described there\&.
 .SH "VERSION"
 .PP

Modified: trunk/samba/docs/manpages/pam_winbind.8
===================================================================
--- trunk/samba/docs/manpages/pam_winbind.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/pam_winbind.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: pam_winbind
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: 8
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND" "8" "01/18/2013" "Samba 3\&.6" "8"
+.TH "PAM_WINBIND" "8" "03/11/2013" "Samba 3\&.6" "8"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/pam_winbind.conf.5
===================================================================
--- trunk/samba/docs/manpages/pam_winbind.conf.5	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/pam_winbind.conf.5	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: pam_winbind.conf
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: 5
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND\&.CONF" "5" "01/18/2013" "Samba 3\&.6" "5"
+.TH "PAM_WINBIND\&.CONF" "5" "03/11/2013" "Samba 3\&.6" "5"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/pdbedit.8
===================================================================
--- trunk/samba/docs/manpages/pdbedit.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/pdbedit.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: pdbedit
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PDBEDIT" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "PDBEDIT" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -38,7 +47,7 @@
 .PP
 \-L|\-\-list
 .RS 4
-This option lists all the user accounts present in the users database\&. This option prints a list of user/uid pairs separated by the \':\' character\&.
+This option lists all the user accounts present in the users database\&. This option prints a list of user/uid pairs separated by the \*(Aq:\*(Aq character\&.
 .sp
 Example:
 pdbedit \-L
@@ -128,7 +137,7 @@
 .PP
 \-f|\-\-fullname fullname
 .RS 4
-This option can be used while adding or modifying a user account\&. It will specify the user\'s full name\&.
+This option can be used while adding or modifying a user account\&. It will specify the user\*(Aqs full name\&.
 .sp
 Example:
 \-f "Simo Sorce"
@@ -136,7 +145,7 @@
 .PP
 \-h|\-\-homedir homedir
 .RS 4
-This option can be used while adding or modifying a user account\&. It will specify the user\'s home directory network path\&.
+This option can be used while adding or modifying a user account\&. It will specify the user\*(Aqs home directory network path\&.
 .sp
 Example:
 \-h "\e\e\e\eBERSERKER\e\esorce"
@@ -152,7 +161,7 @@
 .PP
 \-S|\-\-script script
 .RS 4
-This option can be used while adding or modifying a user account\&. It will specify the user\'s logon script path\&.
+This option can be used while adding or modifying a user account\&. It will specify the user\*(Aqs logon script path\&.
 .sp
 Example:
 \-S "\e\e\e\eBERSERKER\e\enetlogon\e\esorce\&.bat"
@@ -160,40 +169,40 @@
 .PP
 \-p|\-\-profile profile
 .RS 4
-This option can be used while adding or modifying a user account\&. It will specify the user\'s profile directory\&.
+This option can be used while adding or modifying a user account\&. It will specify the user\*(Aqs profile directory\&.
 .sp
 Example:
 \-p "\e\e\e\eBERSERKER\e\enetlogon"
 .RE
 .PP
-\-M|\'\-\-machine SID\' SID|rid
+\-M|\*(Aq\-\-machine SID\*(Aq SID|rid
 .RS 4
-This option can be used while adding or modifying a machine account\&. It will specify the machines\' new primary group SID (Security Identifier) or rid\&.
+This option can be used while adding or modifying a machine account\&. It will specify the machines\*(Aq new primary group SID (Security Identifier) or rid\&.
 .sp
 Example:
 \-M S\-1\-5\-21\-2447931902\-1787058256\-3961074038\-1201
 .RE
 .PP
-\-U|\'\-\-user SID\' SID|rid
+\-U|\*(Aq\-\-user SID\*(Aq SID|rid
 .RS 4
-This option can be used while adding or modifying a user account\&. It will specify the users\' new SID (Security Identifier) or rid\&.
+This option can be used while adding or modifying a user account\&. It will specify the users\*(Aq new SID (Security Identifier) or rid\&.
 .sp
 Example:
 \-U S\-1\-5\-21\-2447931902\-1787058256\-3961074038\-5004
 .sp
 Example:
-\'\-\-user SID\' S\-1\-5\-21\-2447931902\-1787058256\-3961074038\-5004
+\*(Aq\-\-user SID\*(Aq S\-1\-5\-21\-2447931902\-1787058256\-3961074038\-5004
 .sp
 Example:
 \-U 5004
 .sp
 Example:
-\'\-\-user SID\' 5004
+\*(Aq\-\-user SID\*(Aq 5004
 .RE
 .PP
 \-c|\-\-account\-control account\-control
 .RS 4
-This option can be used while adding or modifying a user account\&. It will specify the users\' account control property\&. Possible flags are listed below\&.
+This option can be used while adding or modifying a user account\&. It will specify the users\*(Aq account control property\&. Possible flags are listed below\&.
 .sp
 
 .sp
@@ -367,7 +376,7 @@
 has been set\&. It only updates the data in the Samba user database\&.
 .sp
 If you wish to add a user and synchronise the password that immediately, use
-smbpasswd\'s
+smbpasswd\*(Aqs
 \fB\-a\fR
 option\&.
 .sp .5v
@@ -503,7 +512,7 @@
 .PP
 \-N|\-\-account\-desc description
 .RS 4
-This option can be used while adding or modifying a user account\&. It will specify the user\'s description field\&.
+This option can be used while adding or modifying a user account\&. It will specify the user\*(Aqs description field\&.
 .sp
 Example:
 \-N "test description"
@@ -511,7 +520,7 @@
 .PP
 \-Z|\-\-logon\-hours\-reset
 .RS 4
-This option can be used while adding or modifying a user account\&. It will reset the user\'s allowed logon hours\&. A user may login at any time afterwards\&.
+This option can be used while adding or modifying a user account\&. It will reset the user\*(Aqs allowed logon hours\&. A user may login at any time afterwards\&.
 .sp
 Example:
 \-Z
@@ -535,7 +544,7 @@
 .PP
 \-I|\-\-domain
 .RS 4
-This option can be used while adding or modifying a user account\&. It will specify the user\'s domain field\&.
+This option can be used while adding or modifying a user account\&. It will specify the user\*(Aqs domain field\&.
 .sp
 Example:
 \-I "MYDOMAIN"

Modified: trunk/samba/docs/manpages/profiles.1
===================================================================
--- trunk/samba/docs/manpages/profiles.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/profiles.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: profiles
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PROFILES" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "PROFILES" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/rpcclient.1
===================================================================
--- trunk/samba/docs/manpages/rpcclient.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/rpcclient.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: rpcclient
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "RPCCLIENT" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "RPCCLIENT" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -467,7 +476,7 @@
 .PP
 deldriver <driver>
 .RS 4
-Delete the specified printer driver for all architectures\&. This does not delete the actual driver files from the server, only the entry from the server\'s list of drivers\&.
+Delete the specified printer driver for all architectures\&. This does not delete the actual driver files from the server, only the entry from the server\*(Aqs list of drivers\&.
 .RE
 .PP
 deldriverex <driver> [architecture] [version]
@@ -652,12 +661,12 @@
 rpcclient
 is designed as a developer testing tool and may not be robust in certain areas (such as command line parsing)\&. It has been known to generate a core dump upon failures when invalid parameters where passed to the interpreter\&.
 .PP
-From Luke Leighton\'s original rpcclient man page:
+From Luke Leighton\*(Aqs original rpcclient man page:
 .PP
 \fIWARNING!\fR
-The MSRPC over SMB code has been developed from examining Network traces\&. No documentation is available from the original creators (Microsoft) on how MSRPC over SMB works, or how the individual MSRPC services work\&. Microsoft\'s implementation of these services has been demonstrated (and reported) to be\&.\&.\&. a bit flaky in places\&.
+The MSRPC over SMB code has been developed from examining Network traces\&. No documentation is available from the original creators (Microsoft) on how MSRPC over SMB works, or how the individual MSRPC services work\&. Microsoft\*(Aqs implementation of these services has been demonstrated (and reported) to be\&.\&.\&. a bit flaky in places\&.
 .PP
-The development of Samba\'s implementation is also a bit rough, and as more of the services are understood, it can even result in versions of
+The development of Samba\*(Aqs implementation is also a bit rough, and as more of the services are understood, it can even result in versions of
 \fBsmbd\fR(8)
 and
 \fBrpcclient\fR(1)

Modified: trunk/samba/docs/manpages/samba.7
===================================================================
--- trunk/samba/docs/manpages/samba.7	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/samba.7	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: samba
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: Miscellanea
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SAMBA" "7" "01/18/2013" "Samba 3\&.6" "Miscellanea"
+.TH "SAMBA" "7" "03/11/2013" "Samba 3\&.6" "Miscellanea"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -55,7 +64,7 @@
 .RS 4
 The
 testparm
-utility is a simple syntax checker for Samba\'s
+utility is a simple syntax checker for Samba\*(Aqs
 \fBsmb.conf\fR(5)
 configuration file\&.
 .RE
@@ -95,7 +104,7 @@
 .RS 4
 The
 smbcacls
-command is a tool to set ACL\'s on remote CIFS servers\&.
+command is a tool to set ACL\*(Aqs on remote CIFS servers\&.
 .RE
 .PP
 \fBsmbsh\fR(1)
@@ -212,11 +221,11 @@
 \fBsmbcquotas\fR(1)
 .RS 4
 smbcquotas
-is a tool that can set remote QUOTA\'s on server with NTFS 5\&.
+is a tool that can set remote QUOTA\*(Aqs on server with NTFS 5\&.
 .RE
 .SH "COMPONENTS"
 .PP
-The Samba suite is made up of several components\&. Each component is described in a separate manual page\&. It is strongly recommended that you read the documentation that comes with Samba and the manual pages of those components that you use\&. If the manual pages and documents aren\'t clear enough then please visit
+The Samba suite is made up of several components\&. Each component is described in a separate manual page\&. It is strongly recommended that you read the documentation that comes with Samba and the manual pages of those components that you use\&. If the manual pages and documents aren\*(Aqt clear enough then please visit
 http://devel\&.samba\&.org
 for information on how to file a bug report or submit a patch\&.
 .PP

Modified: trunk/samba/docs/manpages/sharesec.1
===================================================================
--- trunk/samba/docs/manpages/sharesec.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/sharesec.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: sharesec
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SHARESEC" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "SHARESEC" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -225,7 +234,7 @@
 .IP \(bu 2.3
 .\}
 \fIREAD\fR
-\- Equivalent to \'RX\' permissions
+\- Equivalent to \*(AqRX\*(Aq permissions
 .RE
 .sp
 .RS 4
@@ -237,7 +246,7 @@
 .IP \(bu 2.3
 .\}
 \fICHANGE\fR
-\- Equivalent to \'RXWD\' permissions
+\- Equivalent to \*(AqRXWD\*(Aq permissions
 .RE
 .sp
 .RS 4
@@ -249,7 +258,7 @@
 .IP \(bu 2.3
 .\}
 \fIFULL\fR
-\- Equivalent to \'RWXDPO\' permissions
+\- Equivalent to \*(AqRWXDPO\*(Aq permissions
 .RE
 .SH "EXIT STATUS"
 .PP
@@ -259,7 +268,7 @@
 .PP
 If the operation succeeded, sharesec returns and exit status of 0\&. If
 sharesec
-couldn\'t connect to the specified server, or there was an error getting or setting the ACLs, an exit status of 1 is returned\&. If there was an error parsing any command line arguments, an exit status of 2 is returned\&.
+couldn\*(Aqt connect to the specified server, or there was an error getting or setting the ACLs, an exit status of 1 is returned\&. If there was an error parsing any command line arguments, an exit status of 2 is returned\&.
 .SH "EXAMPLES"
 .PP
 Add full access for SID

Modified: trunk/samba/docs/manpages/smb.conf.5
===================================================================
--- trunk/samba/docs/manpages/smb.conf.5	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/smb.conf.5	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smb.conf
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMB\&.CONF" "5" "01/18/2013" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMB\&.CONF" "5" "03/11/2013" "Samba 3\&.6" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -147,7 +156,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-If no path was given, the path is set to the user\'s home directory\&.
+If no path was given, the path is set to the user\*(Aqs home directory\&.
 .RE
 .sp
 .RE
@@ -199,7 +208,7 @@
 .PP
 This section works like [homes], but for printers\&.
 .PP
-If a [printers] section occurs in the configuration file, users are able to connect to any printer specified in the local host\'s printcap file\&.
+If a [printers] section occurs in the configuration file, users are able to connect to any printer specified in the local host\*(Aqs printcap file\&.
 .PP
 When a connection request is made, the existing sections are scanned\&. If a match is found, it is used\&. If no match is found, but a [homes] section exists, it is used as described above\&. Otherwise, the requested section name is treated as a printer name and the appropriate printcap file is scanned to see if the requested section name is a valid printer share name\&. If a match is found, a new printer share is created by cloning the [printers] section\&.
 .PP
@@ -257,7 +266,7 @@
 .RE
 .\}
 .PP
-All aliases given for a printer in the printcap file are legitimate printer names as far as the server is concerned\&. If your printing subsystem doesn\'t work like that, you will have to set up a pseudo\-printcap\&. This is a file consisting of one or more lines like this:
+All aliases given for a printer in the printcap file are legitimate printer names as far as the server is concerned\&. If your printing subsystem doesn\*(Aqt work like that, you will have to set up a pseudo\-printcap\&. This is a file consisting of one or more lines like this:
 .sp
 .if n \{\
 .RS 4
@@ -532,7 +541,7 @@
 .PP
 %p
 .RS 4
-the path of the service\'s home directory, obtained from your NIS auto\&.map entry\&. The NIS auto\&.map entry is split up as
+the path of the service\*(Aqs home directory, obtained from your NIS auto\&.map entry\&. The NIS auto\&.map entry is split up as
 %N:%p\&.
 .RE
 .PP
@@ -543,7 +552,7 @@
 .PP
 Samba supports
 name mangling
-so that DOS and Windows clients can use files that don\'t conform to the 8\&.3 format\&. It can also be set to adjust the case of 8\&.3 format filenames\&.
+so that DOS and Windows clients can use files that don\*(Aqt conform to the 8\&.3 format\&. It can also be set to adjust the case of 8\&.3 format filenames\&.
 .PP
 There are several options that control the way mangling is performed, and they are grouped here rather than listed separately\&. For the defaults look at the output of the testparm program\&.
 .PP
@@ -553,13 +562,13 @@
 .PP
 case sensitive = yes/no/auto
 .RS 4
-controls whether filenames are case sensitive\&. If they aren\'t, Samba must do a filename search and match on passed names\&. The default setting of auto allows clients that support case sensitive filenames (Linux CIFSVFS and smbclient 3\&.0\&.5 and above currently) to tell the Samba server on a per\-packet basis that they wish to access the file system in a case\-sensitive manner (to support UNIX case sensitive semantics)\&. No Windows or DOS system supports case\-sensitive filename so setting this option to auto is that same as setting it to no for them\&. Default
+controls whether filenames are case sensitive\&. If they aren\*(Aqt, Samba must do a filename search and match on passed names\&. The default setting of auto allows clients that support case sensitive filenames (Linux CIFSVFS and smbclient 3\&.0\&.5 and above currently) to tell the Samba server on a per\-packet basis that they wish to access the file system in a case\-sensitive manner (to support UNIX case sensitive semantics)\&. No Windows or DOS system supports case\-sensitive filename so setting this option to auto is that same as setting it to no for them\&. Default
 \fIauto\fR\&.
 .RE
 .PP
 default case = upper/lower
 .RS 4
-controls what the default case is for new filenames (ie\&. files that don\'t currently exist in the filesystem)\&. Default
+controls what the default case is for new filenames (ie\&. files that don\*(Aqt currently exist in the filesystem)\&. Default
 \fIlower\fR\&. IMPORTANT NOTE: As part of the optimizations for directories containing large numbers of files, the following special case applies\&. If the options
 \m[blue]\fBcase sensitive = yes\fR\m[],
 \m[blue]\fBpreserve case = No\fR\m[], and
@@ -571,7 +580,7 @@
 .PP
 preserve case = yes/no
 .RS 4
-controls whether new files (ie\&. files that don\'t currently exist in the filesystem) are created with the case that the client passes, or if they are forced to be the
+controls whether new files (ie\&. files that don\*(Aqt currently exist in the filesystem) are created with the case that the client passes, or if they are forced to be the
 default
 case\&. Default
 \fIyes\fR\&.
@@ -579,7 +588,7 @@
 .PP
 short preserve case = yes/no
 .RS 4
-controls if new files (ie\&. files that don\'t currently exist in the filesystem) which conform to 8\&.3 syntax, that is all in upper case and of suitable length, are created upper case, or if they are forced to be the
+controls if new files (ie\&. files that don\*(Aqt currently exist in the filesystem) which conform to 8\&.3 syntax, that is all in upper case and of suitable length, are created upper case, or if they are forced to be the
 default
 case\&. This option can be used with
 preserve case = yes
@@ -604,7 +613,7 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-If the client has passed a username/password pair and that username/password pair is validated by the UNIX system\'s password programs, the connection is made as that username\&. This includes the
+If the client has passed a username/password pair and that username/password pair is validated by the UNIX system\*(Aqs password programs, the connection is made as that username\&. This includes the
 \e\eserver\eservice%\fIusername\fR
 method of passing a username\&.
 .RE
@@ -628,7 +637,7 @@
 .sp -1
 .IP "  3." 4.2
 .\}
-The client\'s NetBIOS name and any previously used usernames are checked against the supplied password\&. If they match, the connection is allowed as the corresponding user\&.
+The client\*(Aqs NetBIOS name and any previously used usernames are checked against the supplied password\&. If they match, the connection is allowed as the corresponding user\&.
 .RE
 .sp
 .RS 4
@@ -654,7 +663,7 @@
 user =
 field is given in the
 smb\&.conf
-file for the service and the client has supplied a password, and that password matches (according to the UNIX system\'s password checking) with one of the usernames from the
+file for the service and the client has supplied a password, and that password matches (according to the UNIX system\*(Aqs password checking) with one of the usernames from the
 user =
 field, the connection is made as the username in the
 user =
@@ -786,9 +795,9 @@
 .PP
 .RS 4
 This boolean parameter controls what
-\fBsmbd\fR(8)does on receiving a protocol request of "open for delete" from a Windows client\&. If a Windows client doesn\'t have permissions to delete a file then they expect this to be denied at open time\&. POSIX systems normally only detect restrictions on delete by actually attempting to delete the file or directory\&. As Windows clients can (and do) "back out" a delete request by unsetting the "delete on close" bit Samba cannot delete the file immediately on "open for delete" request as we cannot restore such a deleted file\&. With this parameter set to true (the default) then smbd checks the file system permissions directly on "open for delete" and denies the request without actually deleting the file if the file system permissions would seem to deny it\&. This is not perfect, as it\'s possible a user could have deleted a file without Samba being able to check the permissions correctly, but it is close enough to Windows semantics for mostly correct behaviour\&. Samba will correctly check POSIX ACL semantics in this case\&.
+\fBsmbd\fR(8)does on receiving a protocol request of "open for delete" from a Windows client\&. If a Windows client doesn\*(Aqt have permissions to delete a file then they expect this to be denied at open time\&. POSIX systems normally only detect restrictions on delete by actually attempting to delete the file or directory\&. As Windows clients can (and do) "back out" a delete request by unsetting the "delete on close" bit Samba cannot delete the file immediately on "open for delete" request as we cannot restore such a deleted file\&. With this parameter set to true (the default) then smbd checks the file system permissions directly on "open for delete" and denies the request without actually deleting the file if the file system permissions would seem to deny it\&. This is not perfect, as it\*(Aqs possible a user could have deleted a file without Samba being able to check the permissions correctly, but it is close enough to Windows semantics for mostly correct behaviour\&. Samba will correctly check POSIX ACL semantics in this case\&.
 .sp
-If this parameter is set to "false" Samba doesn\'t check permissions on "open for delete" and allows the open\&. If the user doesn\'t have permission to delete the file this will only be discovered at close time, which is too late for the Windows user tools to display an error message to the user\&. The symptom of this is files that appear to have been deleted "magically" re\-appearing on a Windows explorer refresh\&. This is an extremely advanced protocol option which should not need to be changed\&. This parameter was introduced in its final form in 3\&.0\&.21, an earlier version with slightly different semantics was introduced in 3\&.0\&.20\&. That older version is not documented here\&.
+If this parameter is set to "false" Samba doesn\*(Aqt check permissions on "open for delete" and allows the open\&. If the user doesn\*(Aqt have permission to delete the file this will only be discovered at close time, which is too late for the Windows user tools to display an error message to the user\&. The symptom of this is files that appear to have been deleted "magically" re\-appearing on a Windows explorer refresh\&. This is an extremely advanced protocol option which should not need to be changed\&. This parameter was introduced in its final form in 3\&.0\&.21, an earlier version with slightly different semantics was introduced in 3\&.0\&.20\&. That older version is not documented here\&.
 .sp
 Default:
 \fI\fIacl check permissions\fR\fR\fI = \fR\fITrue\fR\fI \fR
@@ -876,7 +885,7 @@
 .RS 4
 This is the full pathname to a script that will be run by
 \fBsmbd\fR(8)
-when a machine is added to Samba\'s domain and a Unix account matching the machine\'s name appended with a "$" does not already exist\&.
+when a machine is added to Samba\*(Aqs domain and a Unix account matching the machine\*(Aqs name appended with a "$" does not already exist\&.
 .sp
 This option is very similar to the
 \m[blue]\fBadd user script\fR\m[], and likewise uses the %u substitution for the account name\&. Do not use the %m substitution\&.
@@ -1024,7 +1033,7 @@
 .sp
 The
 \fIaddprinter command\fR
-program can output a single line of text, which Samba will set as the port the new printer is connected to\&. If this line isn\'t output, Samba won\'t reload its printer shares\&.
+program can output a single line of text, which Samba will set as the port the new printer is connected to\&. If this line isn\*(Aqt output, Samba won\*(Aqt reload its printer shares\&.
 .sp
 Default:
 \fI\fIaddprinter command\fR\fR\fI = \fR\fI\fR\fI \fR
@@ -1337,7 +1346,7 @@
 .sp
 Setting this option to a larger value could be useful to sites transitioning from WinNT and Win2k, as existing user and group rids would otherwise clash with sytem users etc\&.
 .sp
-All UIDs and GIDs must be able to be resolved into SIDs for the correct operation of ACLs on the server\&. As such the algorithmic mapping can\'t be \'turned off\', but pushing it \'out of the way\' should resolve the issues\&. Users and groups can then be assigned \'low\' RIDs in arbitrary\-rid supporting backends\&.
+All UIDs and GIDs must be able to be resolved into SIDs for the correct operation of ACLs on the server\&. As such the algorithmic mapping can\*(Aqt be \*(Aqturned off\*(Aq, but pushing it \*(Aqout of the way\*(Aq should resolve the issues\&. Users and groups can then be assigned \*(Aqlow\*(Aq RIDs in arbitrary\-rid supporting backends\&.
 .sp
 Default:
 \fI\fIalgorithmic rid base\fR\fR\fI = \fR\fI1000\fR\fI \fR
@@ -1508,7 +1517,7 @@
 \m[blue]\fBbind interfaces only\fR\m[]
 is set then
 nmbd
-will check the source address of any packets coming in on the broadcast sockets and discard any that don\'t match the broadcast addresses of the interfaces in the
+will check the source address of any packets coming in on the broadcast sockets and discard any that don\*(Aqt match the broadcast addresses of the interfaces in the
 \m[blue]\fBinterfaces\fR\m[]
 parameter list\&. As unicast packets are received on the other sockets it allows
 nmbd
@@ -1549,7 +1558,7 @@
 \m[blue]\fBinterfaces\fR\m[]
 parameter list then
 smbpasswd
-will fail to connect in it\'s default mode\&.
+will fail to connect in it\*(Aqs default mode\&.
 smbpasswd
 can be forced to use the primary IP interface of the local host by using its
 \fBsmbpasswd\fR(8)
@@ -1695,7 +1704,7 @@
 .\" change notify
 .PP
 .RS 4
-This parameter specifies whether Samba should reply to a client\'s file change notify requests\&.
+This parameter specifies whether Samba should reply to a client\*(Aqs file change notify requests\&.
 .sp
 You should never need to change this parameter
 .sp
@@ -1802,7 +1811,7 @@
 .\" check password script
 .PP
 .RS 4
-The name of a program that can be used to check password complexity\&. The password is sent to the program\'s standard input\&.
+The name of a program that can be used to check password complexity\&. The password is sent to the program\*(Aqs standard input\&.
 .sp
 The program must return 0 on a good password, or any other value if the password is bad\&. In case the password is considered weak (the program does not return 0) the user will be notified and the password change will fail\&.
 .sp
@@ -1895,7 +1904,7 @@
 If disabled, an NTLM response (and possibly a LANMAN response) will be sent by the client, depending on the value of
 client lanman auth\&.
 .sp
-Note that Windows Vista and later versions already use NTLMv2 by default, and some sites (particularly those following \'best practice\' security polices) only allow NTLMv2 responses, and not the weaker LM or NTLM\&.
+Note that Windows Vista and later versions already use NTLMv2 by default, and some sites (particularly those following \*(Aqbest practice\*(Aq security polices) only allow NTLMv2 responses, and not the weaker LM or NTLM\&.
 .sp
 Default:
 \fI\fIclient ntlmv2 auth\fR\fR\fI = \fR\fIyes\fR\fI \fR
@@ -1958,7 +1967,7 @@
 .sp
 If disabled, Samba will use the name used to look up the server when asking the KDC for a ticket\&. This avoids situations where a server may impersonate another, soliciting authentication as one principal while being known on the network as another\&.
 .sp
-Note that Windows XP SP2 and later versions already follow this behaviour, and Windows Vista and later servers no longer supply this \'rfc4178 hint\' principal on the server side\&.
+Note that Windows XP SP2 and later versions already follow this behaviour, and Windows Vista and later servers no longer supply this \*(Aqrfc4178 hint\*(Aq principal on the server side\&.
 .sp
 Default:
 \fI\fIclient use spnego principal\fR\fR\fI = \fR\fIno\fR\fI \fR
@@ -2017,7 +2026,7 @@
 \fI\fIcomment\fR\fR\fI = \fR\fI # No comment\fR\fI \fR
 .sp
 Example:
-\fI\fIcomment\fR\fR\fI = \fR\fIFred\'s Files\fR\fI \fR
+\fI\fIcomment\fR\fR\fI = \fR\fIFred\*(Aqs Files\fR\fI \fR
 .RE
 
 config backend (G)
@@ -2055,7 +2064,7 @@
 .sp
 This option takes the usual substitutions, which can be very useful\&.
 .sp
-If the config file doesn\'t exist then it won\'t be loaded (allowing you to special case the config files of just a few clients)\&.
+If the config file doesn\*(Aqt exist then it won\*(Aqt be loaded (allowing you to special case the config files of just a few clients)\&.
 .sp
 \fINo default\fR
 .sp
@@ -2067,9 +2076,9 @@
 .\" copy
 .PP
 .RS 4
-This parameter allows you to "clone" service entries\&. The specified service is simply duplicated under the current service\'s name\&. Any parameters specified in the current section will override those in the section being copied\&.
+This parameter allows you to "clone" service entries\&. The specified service is simply duplicated under the current service\*(Aqs name\&. Any parameters specified in the current section will override those in the section being copied\&.
 .sp
-This feature lets you set up a \'template\' service and create similar services easily\&. Note that the service being copied must occur earlier in the configuration file than the service doing the copying\&.
+This feature lets you set up a \*(Aqtemplate\*(Aq service and create similar services easily\&. Note that the service being copied must occur earlier in the configuration file than the service doing the copying\&.
 .sp
 Default:
 \fI\fIcopy\fR\fR\fI = \fR\fI\fR\fI \fR
@@ -2104,7 +2113,7 @@
 .\" create mask
 .PP
 .RS 4
-When a file is created, the necessary permissions are calculated according to the mapping from DOS modes to UNIX permissions, and the resulting UNIX mode is then bit\-wise \'AND\'ed with this parameter\&. This parameter may be thought of as a bit\-wise MASK for the UNIX modes of a file\&. Any bit
+When a file is created, the necessary permissions are calculated according to the mapping from DOS modes to UNIX permissions, and the resulting UNIX mode is then bit\-wise \*(AqAND\*(Aqed with this parameter\&. This parameter may be thought of as a bit\-wise MASK for the UNIX modes of a file\&. Any bit
 \fInot\fR
 set here will be removed from the modes set on a file when it is created\&.
 .sp
@@ -2114,7 +2123,7 @@
 other
 write and execute bits from the UNIX modes\&.
 .sp
-Following this Samba will bit\-wise \'OR\' the UNIX mode created from this parameter with the value of the
+Following this Samba will bit\-wise \*(AqOR\*(Aq the UNIX mode created from this parameter with the value of the
 \m[blue]\fBforce create mode\fR\m[]
 parameter which is set to 000 by default\&.
 .sp
@@ -2245,13 +2254,13 @@
 is set to
 \fBcups\fR\&. Its value is a free form string of options passed directly to the cups library\&.
 .sp
-You can pass any generic print option known to CUPS (as listed in the CUPS "Software Users\' Manual")\&. You can also pass any printer specific option (as listed in "lpoptions \-d printername \-l") valid for the target queue\&. Multiple parameters should be space\-delimited name/value pairs according to the PAPI text option ABNF specification\&. Collection values ("name={a=\&.\&.\&. b=\&.\&.\&. c=\&.\&.\&.}") are stored with the curley brackets intact\&.
+You can pass any generic print option known to CUPS (as listed in the CUPS "Software Users\*(Aq Manual")\&. You can also pass any printer specific option (as listed in "lpoptions \-d printername \-l") valid for the target queue\&. Multiple parameters should be space\-delimited name/value pairs according to the PAPI text option ABNF specification\&. Collection values ("name={a=\&.\&.\&. b=\&.\&.\&. c=\&.\&.\&.}") are stored with the curley brackets intact\&.
 .sp
 You should set this parameter to
 \fBraw\fR
 if your CUPS server
 error_log
-file contains messages such as "Unsupported format \'application/octet\-stream\'" when printing from a Windows client through Samba\&. It is no longer necessary to enable system wide raw printing in
+file contains messages such as "Unsupported format \*(Aqapplication/octet\-stream\*(Aq" when printing from a Windows client through Samba\&. It is no longer necessary to enable system wide raw printing in
 /etc/cups/mime\&.{convs,types}\&.
 .sp
 Default:
@@ -2291,7 +2300,7 @@
 .RS 4
 The value of the parameter (a decimal integer) represents the number of minutes of inactivity before a connection is considered dead, and it is disconnected\&. The deadtime only takes effect if the number of open files is zero\&.
 .sp
-This is useful to stop a server\'s resources being exhausted by a large number of inactive connections\&.
+This is useful to stop a server\*(Aqs resources being exhausted by a large number of inactive connections\&.
 .sp
 Most clients have an auto\-reconnect feature when a connection is broken so in most cases this parameter should be transparent to users\&.
 .sp
@@ -2434,7 +2443,7 @@
 \m[blue]\fBprintable\fR\m[]
 services\&. When smbd is serving Printer Drivers to Windows NT/2k/XP clients, each printer on the Samba server has a Device Mode which defines things such as paper size and orientation and duplex settings\&. The device mode can only correctly be generated by the printer driver itself (which can only be executed on a Win32 platform)\&. Because smbd is unable to execute the driver code to generate the device mode, the default behavior is to set this field to NULL\&.
 .sp
-Most problems with serving printer drivers to Windows NT/2k/XP clients can be traced to a problem with the generated device mode\&. Certain drivers will do things such as crashing the client\'s Explorer\&.exe with a NULL devmode\&. However, other printer drivers can cause the client\'s spooler service (spoolsv\&.exe) to die if the devmode was not created by the driver itself (i\&.e\&. smbd generates a default devmode)\&.
+Most problems with serving printer drivers to Windows NT/2k/XP clients can be traced to a problem with the generated device mode\&. Certain drivers will do things such as crashing the client\*(Aqs Explorer\&.exe with a NULL devmode\&. However, other printer drivers can cause the client\*(Aqs spooler service (spoolsv\&.exe) to die if the devmode was not created by the driver itself (i\&.e\&. smbd generates a default devmode)\&.
 .sp
 This parameter should be used with care and tested with the printer driver in question\&. It is better to leave the device mode to NULL and let the Windows client set the correct values\&. Because drivers do not do this all the time, setting
 default devmode = yes
@@ -2644,7 +2653,7 @@
 \fBsmbd\fR(8)
 when managing users with remote RPC (NT) tools\&.
 .sp
-This script is called when a remote client removes a user from the server, normally using \'User Manager for Domains\' or
+This script is called when a remote client removes a user from the server, normally using \*(AqUser Manager for Domains\*(Aq or
 rpcclient\&.
 .sp
 This script should delete the given UNIX username\&.
@@ -2727,7 +2736,7 @@
 .nf
  
 #!/bin/sh
-df $1 | tail \-1 | awk \'{print $(NF\-4),$(NF\-2)}\'
+df $1 | tail \-1 | awk \*(Aq{print $(NF\-4),$(NF\-2)}\*(Aq
 .fi
 .if n \{\
 .RE
@@ -2741,7 +2750,7 @@
 .nf
  
 #!/bin/sh
-/usr/bin/df \-k $1 | tail \-1 | awk \'{print $3" "$5}\'
+/usr/bin/df \-k $1 | tail \-1 | awk \*(Aq{print $3" "$5}\*(Aq
 .fi
 .if n \{\
 .RE
@@ -2771,13 +2780,13 @@
 .RS 4
 This parameter is the octal modes which are used when converting DOS modes to UNIX modes when creating UNIX directories\&.
 .sp
-When a directory is created, the necessary permissions are calculated according to the mapping from DOS modes to UNIX permissions, and the resulting UNIX mode is then bit\-wise \'AND\'ed with this parameter\&. This parameter may be thought of as a bit\-wise MASK for the UNIX modes of a directory\&. Any bit
+When a directory is created, the necessary permissions are calculated according to the mapping from DOS modes to UNIX permissions, and the resulting UNIX mode is then bit\-wise \*(AqAND\*(Aqed with this parameter\&. This parameter may be thought of as a bit\-wise MASK for the UNIX modes of a directory\&. Any bit
 \fInot\fR
 set here will be removed from the modes set on a directory when it is created\&.
 .sp
-The default value of this parameter removes the \'group\' and \'other\' write bits from the UNIX mode, allowing only the user who owns the directory to modify it\&.
+The default value of this parameter removes the \*(Aqgroup\*(Aq and \*(Aqother\*(Aq write bits from the UNIX mode, allowing only the user who owns the directory to modify it\&.
 .sp
-Following this Samba will bit\-wise \'OR\' the UNIX mode created from this parameter with the value of the
+Following this Samba will bit\-wise \*(AqOR\*(Aq the UNIX mode created from this parameter with the value of the
 \m[blue]\fBforce directory mode\fR\m[]
 parameter\&. This parameter is set to 000 by default (i\&.e\&. no extra mode bits are added)\&.
 .sp
@@ -2807,7 +2816,7 @@
 .RS 4
 This parameter controls what UNIX permission bits will be set when a Windows NT client is manipulating the UNIX permission on a directory using the native NT security dialog box\&.
 .sp
-This parameter is applied as a mask (AND\'ed with) to the incoming permission bits, thus resetting any bits not in this mask\&. Make sure not to mix up this parameter with
+This parameter is applied as a mask (AND\*(Aqed with) to the incoming permission bits, thus resetting any bits not in this mask\&. Make sure not to mix up this parameter with
 \m[blue]\fBforce directory security mode\fR\m[], which works similar like this one but uses logical OR instead of AND\&. Essentially, zero bits in this mask are a set of bits that will always be set to zero\&.
 .sp
 Essentially, all bits set to zero in this mask will result in setting to zero the corresponding bits on the file permissions regardless of the previous status of this bits on the file\&.
@@ -2842,7 +2851,7 @@
 \fBNote\fR
 .ps -1
 .br
-Clients that only support netbios won\'t be able to see your samba server when netbios support is disabled\&.
+Clients that only support netbios won\*(Aqt be able to see your samba server when netbios support is disabled\&.
 .sp .5v
 .RE
 Default:
@@ -2853,7 +2862,7 @@
 .\" disable spoolss
 .PP
 .RS 4
-Enabling this parameter will disable Samba\'s support for the SPOOLSS set of MS\-RPC\'s and will yield identical behavior as Samba 2\&.0\&.x\&. Windows NT/2000 clients will downgrade to using Lanman style printing commands\&. Windows 9x/ME will be unaffected by the parameter\&. However, this will also disable the ability to upload printer drivers to a Samba server via the Windows NT Add Printer Wizard or by using the NT printer properties dialog window\&. It will also disable the capability of Windows NT/2000 clients to download print drivers from the Samba host upon demand\&.
+Enabling this parameter will disable Samba\*(Aqs support for the SPOOLSS set of MS\-RPC\*(Aqs and will yield identical behavior as Samba 2\&.0\&.x\&. Windows NT/2000 clients will downgrade to using Lanman style printing commands\&. Windows 9x/ME will be unaffected by the parameter\&. However, this will also disable the ability to upload printer drivers to a Samba server via the Windows NT Add Printer Wizard or by using the NT printer properties dialog window\&. It will also disable the capability of Windows NT/2000 clients to download print drivers from the Samba host upon demand\&.
 \fIBe very careful about enabling this parameter\&.\fR
 .sp
 Default:
@@ -2957,7 +2966,7 @@
 When
 \m[blue]\fBdomain logons = Yes\fR\m[]
 the default setting for this parameter is Yes, with the result that Samba will be a PDC\&. If
-\m[blue]\fBdomain master = No\fR\m[], Samba will function as a BDC\&. In general, this parameter should be set to \'No\' only on a BDC\&.
+\m[blue]\fBdomain master = No\fR\m[], Samba will function as a BDC\&. In general, this parameter should be set to \*(AqNo\*(Aq only on a BDC\&.
 .sp
 Default:
 \fI\fIdomain master\fR\fR\fI = \fR\fIauto\fR\fI \fR
@@ -3179,7 +3188,7 @@
 .sp
 This option is mainly used as a compatibility option for Visual C++ when used against Samba shares\&. Visual C++ generated makefiles have the object directory as a dependency for each object file, and a make rule to create the directory\&. Also, when NMAKE compares timestamps it uses the creation time when examining a directory\&. Thus the object directory will be created if it does not exist, but once it does exist it will always have an earlier timestamp than the object files it contains\&.
 .sp
-However, Unix time semantics mean that the create time reported by Samba will be updated whenever a file is created or or deleted in the directory\&. NMAKE finds all object files in the object directory\&. The timestamp of the last one built is then compared to the timestamp of the object directory\&. If the directory\'s timestamp if newer, then all object files will be rebuilt\&. Enabling this option ensures directories always predate their contents and an NMAKE build will proceed as expected\&.
+However, Unix time semantics mean that the create time reported by Samba will be updated whenever a file is created or or deleted in the directory\&. NMAKE finds all object files in the object directory\&. The timestamp of the last one built is then compared to the timestamp of the object directory\&. If the directory\*(Aqs timestamp if newer, then all object files will be rebuilt\&. Enabling this option ensures directories always predate their contents and an NMAKE build will proceed as expected\&.
 .sp
 Default:
 \fI\fIfake directory create times\fR\fR\fI = \fR\fIno\fR\fI \fR
@@ -3232,11 +3241,11 @@
 .RS 4
 This parameter specifies a set of UNIX mode bit permissions that will
 \fIalways\fR
-be set on a file created by Samba\&. This is done by bitwise \'OR\'ing these bits onto the mode bits of a file that is being created\&. The default for this parameter is (in octal) 000\&. The modes in this parameter are bitwise \'OR\'ed onto the file mode after the mask set in the
+be set on a file created by Samba\&. This is done by bitwise \*(AqOR\*(Aqing these bits onto the mode bits of a file that is being created\&. The default for this parameter is (in octal) 000\&. The modes in this parameter are bitwise \*(AqOR\*(Aqed onto the file mode after the mask set in the
 \fIcreate mask\fR
 parameter is applied\&.
 .sp
-The example below would force all newly created files to have read and execute permissions set for \'group\' and \'other\' as well as the read/write/execute bits set for the \'user\'\&.
+The example below would force all newly created files to have read and execute permissions set for \*(Aqgroup\*(Aq and \*(Aqother\*(Aq as well as the read/write/execute bits set for the \*(Aquser\*(Aq\&.
 .sp
 Default:
 \fI\fIforce create mode\fR\fR\fI = \fR\fI000\fR\fI \fR
@@ -3251,11 +3260,11 @@
 .RS 4
 This parameter specifies a set of UNIX mode bit permissions that will
 \fIalways\fR
-be set on a directory created by Samba\&. This is done by bitwise \'OR\'ing these bits onto the mode bits of a directory that is being created\&. The default for this parameter is (in octal) 0000 which will not add any extra permission bits to a created directory\&. This operation is done after the mode mask in the parameter
+be set on a directory created by Samba\&. This is done by bitwise \*(AqOR\*(Aqing these bits onto the mode bits of a directory that is being created\&. The default for this parameter is (in octal) 0000 which will not add any extra permission bits to a created directory\&. This operation is done after the mode mask in the parameter
 \fIdirectory mask\fR
 is applied\&.
 .sp
-The example below would force all created directories to have read and execute permissions set for \'group\' and \'other\' as well as the read/write/execute bits set for the \'user\'\&.
+The example below would force all created directories to have read and execute permissions set for \*(Aqgroup\*(Aq and \*(Aqother\*(Aq as well as the read/write/execute bits set for the \*(Aquser\*(Aq\&.
 .sp
 Default:
 \fI\fIforce directory mode\fR\fR\fI = \fR\fI000\fR\fI \fR
@@ -3270,7 +3279,7 @@
 .RS 4
 This parameter controls what UNIX permission bits can be modified when a Windows NT client is manipulating the UNIX permission on a directory using the native NT security dialog box\&.
 .sp
-This parameter is applied as a mask (OR\'ed with) to the changed permission bits, thus forcing any bits in this mask that the user may have modified to be on\&. Make sure not to mix up this parameter with
+This parameter is applied as a mask (OR\*(Aqed with) to the changed permission bits, thus forcing any bits in this mask that the user may have modified to be on\&. Make sure not to mix up this parameter with
 \m[blue]\fBdirectory security mask\fR\m[], which works in a similar manner to this one, but uses a logical AND instead of an OR\&.
 .sp
 Essentially, this mask may be treated as a set of bits that, when modifying security on a directory, to will enable (1) any flags that are off (0) but which the mask has set to on (1)\&.
@@ -3312,7 +3321,7 @@
 .RS 4
 This specifies a UNIX group name that will be assigned as the default primary group for all users connecting to this service\&. This is useful for sharing files by ensuring that all access to files on service will use the named group for their permissions checking\&. Thus, by assigning permissions for this group to the files and directories within this service the Samba administrator can restrict or allow sharing of these files\&.
 .sp
-In Samba 2\&.0\&.5 and above this parameter has extended functionality in the following way\&. If the group name listed here has a \'+\' character prepended to it then the current user accessing the share only has the primary group default assigned to this group if they are already assigned as a member of that group\&. This allows an administrator to decide that only users who are already in a particular group will create files with group ownership set to that group\&. This gives a finer granularity of ownership assignment\&. For example, the setting
+In Samba 2\&.0\&.5 and above this parameter has extended functionality in the following way\&. If the group name listed here has a \*(Aq+\*(Aq character prepended to it then the current user accessing the share only has the primary group default assigned to this group if they are already assigned as a member of that group\&. This allows an administrator to decide that only users who are already in a particular group will create files with group ownership set to that group\&. This gives a finer granularity of ownership assignment\&. For example, the setting
 force group = +sys
 means that only users who are already in group sys will have their default primary group assigned to sys when accessing this Samba share\&. All other users will retain their ordinary primary group\&.
 .sp
@@ -3340,12 +3349,12 @@
 \fIprinter name\fR
 option)\&.
 .sp
-When assigning a new driver to a printer on a remote Windows compatible print server such as Samba, the Windows client will rename the printer to match the driver name just uploaded\&. This can result in confusion for users when multiple printers are bound to the same driver\&. To prevent Samba from allowing the printer\'s printername to differ from the sharename defined in smb\&.conf, set
+When assigning a new driver to a printer on a remote Windows compatible print server such as Samba, the Windows client will rename the printer to match the driver name just uploaded\&. This can result in confusion for users when multiple printers are bound to the same driver\&. To prevent Samba from allowing the printer\*(Aqs printername to differ from the sharename defined in smb\&.conf, set
 \fIforce printername = yes\fR\&.
 .sp
 Be aware that enabling this parameter may affect migrating printers from a Windows server to Samba since Windows has no way to force the sharename and printername to match\&.
 .sp
-It is recommended that this parameter\'s value not be changed once the printer is in use by clients as this could cause a user not be able to delete printer connections from their local Printers folder\&.
+It is recommended that this parameter\*(Aqs value not be changed once the printer is in use by clients as this could cause a user not be able to delete printer connections from their local Printers folder\&.
 .sp
 Default:
 \fI\fIforce printername\fR\fR\fI = \fR\fIno\fR\fI \fR
@@ -3357,7 +3366,7 @@
 .RS 4
 This parameter controls what UNIX permission bits can be modified when a Windows NT client is manipulating the UNIX permission on a file using the native NT security dialog box\&.
 .sp
-This parameter is applied as a mask (OR\'ed with) to the changed permission bits, thus forcing any bits in this mask that the user may have modified to be on\&. Make sure not to mix up this parameter with
+This parameter is applied as a mask (OR\*(Aqed with) to the changed permission bits, thus forcing any bits in this mask that the user may have modified to be on\&. Make sure not to mix up this parameter with
 \m[blue]\fBsecurity mask\fR\m[], which works similar like this one but uses logical AND instead of OR\&.
 .sp
 Essentially, one bits in this mask may be treated as a set of bits that, when modifying security on a file, the user has always set to be on\&.
@@ -3728,11 +3737,11 @@
 .\" hide files
 .PP
 .RS 4
-This is a list of files or directories that are not visible but are accessible\&. The DOS \'hidden\' attribute is applied to any files or directories that match\&.
+This is a list of files or directories that are not visible but are accessible\&. The DOS \*(Aqhidden\*(Aq attribute is applied to any files or directories that match\&.
 .sp
-Each entry in the list must be separated by a \'/\', which allows spaces to be included in the entry\&. \'*\' and \'?\' can be used to specify multiple files or directories as in DOS wildcards\&.
+Each entry in the list must be separated by a \*(Aq/\*(Aq, which allows spaces to be included in the entry\&. \*(Aq*\*(Aq and \*(Aq?\*(Aq can be used to specify multiple files or directories as in DOS wildcards\&.
 .sp
-Each entry must be a Unix path, not a DOS path and must not include the Unix directory separator \'/\'\&.
+Each entry must be a Unix path, not a DOS path and must not include the Unix directory separator \*(Aq/\*(Aq\&.
 .sp
 Note that the case sensitivity option is applicable in hiding files\&.
 .sp
@@ -3762,7 +3771,7 @@
 .\" hide special files
 .PP
 .RS 4
-This parameter prevents clients from seeing special files such as sockets, devices and fifo\'s in directory listings\&.
+This parameter prevents clients from seeing special files such as sockets, devices and fifo\*(Aqs in directory listings\&.
 .sp
 Default:
 \fI\fIhide special files\fR\fR\fI = \fR\fIno\fR\fI \fR
@@ -3799,7 +3808,7 @@
 \fBsmbd\fR(8)
 is also acting as a Win95/98
 \fIlogon server\fR
-then this parameter specifies the NIS (or YP) map from which the server for the user\'s home directory should be extracted\&. At present, only the Sun auto\&.home map format is understood\&. The form of the map is:
+then this parameter specifies the NIS (or YP) map from which the server for the user\*(Aqs home directory should be extracted\&. At present, only the Sun auto\&.home map format is understood\&. The form of the map is:
 .sp
 .if n \{\
 .RS 4
@@ -3811,7 +3820,7 @@
 .RE
 .\}
 .sp
-and the program will extract the servername from before the first \':\'\&. There should probably be a better parsing system that copes with different map formats and also Amd (another automounter) maps\&.
+and the program will extract the servername from before the first \*(Aq:\*(Aq\&. There should probably be a better parsing system that copes with different map formats and also Amd (another automounter) maps\&.
 .if n \{\
 .sp
 .\}
@@ -3988,7 +3997,7 @@
 .\" idmap cache time
 .PP
 .RS 4
-This parameter specifies the number of seconds that Winbind\'s idmap interface will cache positive SID/uid/gid query results\&.
+This parameter specifies the number of seconds that Winbind\*(Aqs idmap interface will cache positive SID/uid/gid query results\&.
 .sp
 Default:
 \fI\fIidmap cache time\fR\fR\fI = \fR\fI604800 (one week)\fR\fI \fR
@@ -3998,7 +4007,7 @@
 .\" idmap config
 .PP
 .RS 4
-ID mapping in Samba is the mapping between Windows SIDs and Unix user and group IDs\&. This is performed by Winbindd with a configurable plugin interface\&. Samba\'s ID mapping is configured by options starting with the
+ID mapping in Samba is the mapping between Windows SIDs and Unix user and group IDs\&. This is performed by Winbindd with a configurable plugin interface\&. Samba\*(Aqs ID mapping is configured by options starting with the
 \m[blue]\fBidmap config\fR\m[]
 prefix\&. An idmap option consists of the
 \m[blue]\fBidmap config\fR\m[]
@@ -4081,7 +4090,7 @@
 .\" idmap negative cache time
 .PP
 .RS 4
-This parameter specifies the number of seconds that Winbind\'s idmap interface will cache negative SID/uid/gid query results\&.
+This parameter specifies the number of seconds that Winbind\*(Aqs idmap interface will cache negative SID/uid/gid query results\&.
 .sp
 Default:
 \fI\fIidmap negative cache time\fR\fR\fI = \fR\fI120\fR\fI \fR
@@ -4156,7 +4165,7 @@
 .RS 4
 The ownership of new files and directories is normally governed by effective uid of the connected user\&. This option allows the Samba administrator to specify that the ownership for new files and directories should be controlled by the ownership of the parent directory\&.
 .sp
-Common scenarios where this behavior is useful is in implementing drop\-boxes where users can create and edit files but not delete them and to ensure that newly create files in a user\'s roaming profile directory are actually owner by the user\&.
+Common scenarios where this behavior is useful is in implementing drop\-boxes where users can create and edit files but not delete them and to ensure that newly create files in a user\*(Aqs roaming profile directory are actually owner by the user\&.
 .sp
 Default:
 \fI\fIinherit owner\fR\fR\fI = \fR\fIno\fR\fI \fR
@@ -4276,7 +4285,7 @@
 .RE
 The "mask" parameters can either be a bit length (such as 24 for a C class network) or a full netmask in dotted decimal form\&.
 .sp
-The "IP" parameters above can either be a full dotted decimal IP address or a hostname which will be looked up via the OS\'s normal hostname resolution mechanisms\&.
+The "IP" parameters above can either be a full dotted decimal IP address or a hostname which will be looked up via the OS\*(Aqs normal hostname resolution mechanisms\&.
 .sp
 By default Samba enables all active interfaces that are broadcast capable except the loopback adaptor (IP address 127\&.0\&.0\&.1)\&.
 .sp
@@ -4297,13 +4306,13 @@
 \fIparanoid\fR
 check to absolutely ensure an improper setting does not breach your security\&.
 .sp
-A name starting with a \'@\' is interpreted as an NIS netgroup first (if your system supports NIS), and then as a UNIX group if the name was not found in the NIS netgroup database\&.
+A name starting with a \*(Aq@\*(Aq is interpreted as an NIS netgroup first (if your system supports NIS), and then as a UNIX group if the name was not found in the NIS netgroup database\&.
 .sp
-A name starting with \'+\' is interpreted only by looking in the UNIX group database via the NSS getgrnam() interface\&. A name starting with \'&\' is interpreted only by looking in the NIS netgroup database (this requires NIS to be working on your system)\&. The characters \'+\' and \'&\' may be used at the start of the name in either order so the value
+A name starting with \*(Aq+\*(Aq is interpreted only by looking in the UNIX group database via the NSS getgrnam() interface\&. A name starting with \*(Aq&\*(Aq is interpreted only by looking in the NIS netgroup database (this requires NIS to be working on your system)\&. The characters \*(Aq+\*(Aq and \*(Aq&\*(Aq may be used at the start of the name in either order so the value
 \fI+&group\fR
 means check the UNIX group database, followed by the NIS netgroup database, and the value
 \fI&+group\fR
-means check the NIS netgroup database, followed by the UNIX group database (the same as the \'@\' prefix)\&.
+means check the NIS netgroup database, followed by the UNIX group database (the same as the \*(Aq@\*(Aq prefix)\&.
 .sp
 The current servicename is substituted for
 \fI%S\fR\&. This is useful in the [homes] section\&.
@@ -4462,13 +4471,13 @@
 .sp
 When this parameter is set to
 no
-this will also result in sambaLMPassword in Samba\'s passdb being blanked after the next password change\&. As a result of that lanman clients won\'t be able to authenticate, even if lanman auth is reenabled later on\&.
+this will also result in sambaLMPassword in Samba\*(Aqs passdb being blanked after the next password change\&. As a result of that lanman clients won\*(Aqt be able to authenticate, even if lanman auth is reenabled later on\&.
 .sp
 Unlike the
 encrypt passwords
 option, this parameter cannot alter client behaviour, and the LANMAN response will still be sent over the network\&. See the
 client lanman auth
-to disable this for Samba\'s clients (such as smbclient)
+to disable this for Samba\*(Aqs clients (such as smbclient)
 .sp
 If this option, and
 ntlm auth
@@ -4538,7 +4547,7 @@
 \fI1\fR
 for tracing function calls\&.
 .sp
-The debug ouput from the LDAP libraries appears with the prefix [LDAP] in Samba\'s logging output\&. The level at which LDAP logging is printed is controlled by the parameter
+The debug ouput from the LDAP libraries appears with the prefix [LDAP] in Samba\*(Aqs logging output\&. The level at which LDAP logging is printed is controlled by the parameter
 \fIldap debug threshold\fR\&.
 .sp
 Default:
@@ -4601,7 +4610,7 @@
 to enable following referrals,
 \fIoff\fR
 to disable this, and
-\fIauto\fR, to use the libldap default settings\&. libldap\'s choice of following referrals or not is set in /etc/openldap/ldap\&.conf with the REFERRALS parameter as documented in ldap\&.conf(5)\&.
+\fIauto\fR, to use the libldap default settings\&. libldap\*(Aqs choice of following referrals or not is set in /etc/openldap/ldap\&.conf with the REFERRALS parameter as documented in ldap\&.conf(5)\&.
 .sp
 Default:
 \fI\fIldap follow referral\fR\fR\fI = \fR\fIauto\fR\fI \fR
@@ -4731,7 +4740,7 @@
 .\" ldap replication sleep
 .PP
 .RS 4
-When Samba is asked to write to a read\-only LDAP replica, we are redirected to talk to the read\-write master server\&. This server then replicates our changes back to the \'local\' server, however the replication might take some seconds, especially over slow links\&. Certain client activities, particularly domain joins, can become confused by the \'success\' that does not immediately change the LDAP back\-end\'s data\&.
+When Samba is asked to write to a read\-only LDAP replica, we are redirected to talk to the read\-write master server\&. This server then replicates our changes back to the \*(Aqlocal\*(Aq server, however the replication might take some seconds, especially over slow links\&. Certain client activities, particularly domain joins, can become confused by the \*(Aqsuccess\*(Aq that does not immediately change the LDAP back\-end\*(Aqs data\&.
 .sp
 This option simply causes Samba to wait a short time, to allow the LDAP server to catch up\&. If you have a particularly high\-latency network, you may wish to time the LDAP replication with a network sniffer, and increase this value accordingly\&. Be aware that no checking is performed that the data has actually replicated\&.
 .sp
@@ -4855,7 +4864,7 @@
 .RS 4
 This option is used to define whether or not Samba should use SSL when connecting to the ldap server using
 \fIads\fR
-methods\&. Rpc methods are not affected by this parameter\&. Please note, that this parameter won\'t have any effect if
+methods\&. Rpc methods are not affected by this parameter\&. Please note, that this parameter won\*(Aqt have any effect if
 \m[blue]\fBldap ssl\fR\m[]
 is set to
 \fIno\fR\&.
@@ -4875,7 +4884,7 @@
 .RS 4
 This option is used to define whether or not Samba should use SSL when connecting to the ldap server This is
 \fINOT\fR
-related to Samba\'s previous SSL support which was enabled by specifying the
+related to Samba\*(Aqs previous SSL support which was enabled by specifying the
 \-\-with\-ssl
 option to the
 configure
@@ -5078,7 +5087,7 @@
 will not attempt to become a local master browser on a subnet and will also lose in all browsing elections\&. By default this value is set to
 \fByes\fR\&. Setting this value to
 \fByes\fR
-doesn\'t mean that Samba will
+doesn\*(Aqt mean that Samba will
 \fIbecome\fR
 the local master browser on a subnet, just that
 nmbd
@@ -5459,7 +5468,7 @@
 .sp
 This option takes the standard substitutions, allowing you to have separate logon scripts for each user or machine\&.
 .sp
-This parameter can be used with Win9X workstations to ensure that roaming profiles are stored in a subdirectory of the user\'s home directory\&. This is done in the following way:
+This parameter can be used with Win9X workstations to ensure that roaming profiles are stored in a subdirectory of the user\*(Aqs home directory\&. This is done in the following way:
 .sp
 
 logon home = \e\e%N\e%U\eprofile
@@ -5617,7 +5626,7 @@
 .RS 4
 This parameter specifies the command to be executed on the server host in order to stop printing or spooling a specific print job\&.
 .sp
-This command should be a program or script which takes a printer name and job number to pause the print job\&. One way of implementing this is by using job priorities, where jobs having a too low priority won\'t be sent to the printer\&.
+This command should be a program or script which takes a printer name and job number to pause the print job\&. One way of implementing this is by using job priorities, where jobs having a too low priority won\*(Aqt be sent to the printer\&.
 .sp
 If a
 \fI%p\fR
@@ -5647,7 +5656,7 @@
 lpq
 command used by the system, so if you use different
 lpq
-commands for different users then they won\'t share cache information\&.
+commands for different users then they won\*(Aqt share cache information\&.
 .sp
 The cache files are stored in
 /tmp/lpq\&.xxxx
@@ -5899,7 +5908,7 @@
 .sp
 Note that the character to use may be specified using the
 \m[blue]\fBmangling char\fR\m[]
-option, if you don\'t like \'~\'\&.
+option, if you don\*(Aqt like \*(Aq~\*(Aq\&.
 .RE
 .sp
 .RS 4
@@ -5910,7 +5919,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Files whose UNIX name begins with a dot will be presented as DOS hidden files\&. The mangled name will be created as for other filenames, but with the leading dot removed and "___" as its extension regardless of actual original extension (that\'s three underscores)\&.
+Files whose UNIX name begins with a dot will be presented as DOS hidden files\&. The mangled name will be created as for other filenames, but with the leading dot removed and "___" as its extension regardless of actual original extension (that\*(Aqs three underscores)\&.
 .RE
 .sp
 .RE
@@ -5946,7 +5955,7 @@
 This controls what character is used as the
 \fImagic\fR
 character in
-\m[blue]\fBname mangling\fR\m[]\&. The default is a \'~\' but this may interfere with some software\&. Use this option to set it to whatever you prefer\&. This is effective only when mangling method is hash\&.
+\m[blue]\fBname mangling\fR\m[]\&. The default is a \*(Aq~\*(Aq but this may interfere with some software\&. Use this option to set it to whatever you prefer\&. This is effective only when mangling method is hash\&.
 .sp
 Default:
 \fI\fImangling char\fR\fR\fI = \fR\fI~\fR\fI \fR
@@ -5974,7 +5983,7 @@
 .RS 4
 This boolean parameter controls whether
 \fBsmbd\fR(8)
-will attempt to map the \'inherit\' and \'protected\' access control entry flags stored in Windows ACLs into an extended attribute called user\&.SAMBA_PAI\&. This parameter only takes effect if Samba is being run on a platform that supports extended attributes (Linux and IRIX so far) and allows the Windows 2000 ACL editor to correctly use inheritance with the Samba POSIX ACL mapping code\&.
+will attempt to map the \*(Aqinherit\*(Aq and \*(Aqprotected\*(Aq access control entry flags stored in Windows ACLs into an extended attribute called user\&.SAMBA_PAI\&. This parameter only takes effect if Samba is being run on a platform that supports extended attributes (Linux and IRIX so far) and allows the Windows 2000 ACL editor to correctly use inheritance with the Samba POSIX ACL mapping code\&.
 .sp
 Default:
 \fI\fImap acl inherit\fR\fR\fI = \fR\fIno\fR\fI \fR
@@ -6111,7 +6120,7 @@
 .sp
 This parameter can take four different values, which tell
 \fBsmbd\fR(8)
-what to do with user login requests that don\'t match a valid UNIX user in some way\&.
+what to do with user login requests that don\*(Aqt match a valid UNIX user in some way\&.
 .sp
 The four settings are :
 .sp
@@ -6193,7 +6202,7 @@
 .\" map untrusted to domain
 .PP
 .RS 4
-If a client connects to smbd using an untrusted domain name, such as BOGUS\euser, smbd replaces the BOGUS domain with it\'s SAM name before attempting to authenticate that user\&. In the case where smbd is acting as a PDC this will be DOMAIN\euser\&. In the case where smbd is acting as a domain member server or a standalone server this will be WORKSTATION\euser\&.
+If a client connects to smbd using an untrusted domain name, such as BOGUS\euser, smbd replaces the BOGUS domain with it\*(Aqs SAM name before attempting to authenticate that user\&. In the case where smbd is acting as a PDC this will be DOMAIN\euser\&. In the case where smbd is acting as a domain member server or a standalone server this will be WORKSTATION\euser\&.
 .sp
 In previous versions of Samba (pre 3\&.4), if smbd was acting as a domain member server, the BOGUS domain name would instead be replaced by the primary domain which smbd was a member of\&. In this case authentication would be deferred off to a DC using the credentials DOMAIN\euser\&.
 .sp
@@ -6233,7 +6242,7 @@
 Note that this option does not limit the amount of data you can put on the disk\&. In the above case you could still store much more than 100 MB on the disk, but if a client ever asks for the amount of free disk space or the total disk size then the result will be bounded by the amount specified in
 \fImax disk size\fR\&.
 .sp
-This option is primarily useful to work around bugs in some pieces of software that can\'t handle very large disks, particularly disks over 1GB in size\&.
+This option is primarily useful to work around bugs in some pieces of software that can\*(Aqt handle very large disks, particularly disks over 1GB in size\&.
 .sp
 A
 \fImax disk size\fR
@@ -6447,7 +6456,7 @@
 .RS 4
 This option tells
 \fBnmbd\fR(8)
-what the default \'time to live\' of NetBIOS names should be (in seconds) when
+what the default \*(Aqtime to live\*(Aq of NetBIOS names should be (in seconds) when
 nmbd
 is requesting a name using either a broadcast packet or from a WINS server\&. You should never need to change this parameter\&. The default is 3 days\&.
 .sp
@@ -6461,7 +6470,7 @@
 .RS 4
 This option tells
 \fBsmbd\fR(8)
-when acting as a WINS server (\m[blue]\fBwins support = yes\fR\m[]) what the maximum \'time to live\' of NetBIOS names that
+when acting as a WINS server (\m[blue]\fBwins support = yes\fR\m[]) what the maximum \*(Aqtime to live\*(Aq of NetBIOS names that
 nmbd
 will grant will be (in seconds)\&. You should never need to change this parameter\&. The default is 6 days (518400 seconds)\&.
 .sp
@@ -6496,7 +6505,7 @@
 .RS 4
 .\}
 .nf
-message command = csh \-c \'xedit %s;rm %s\' &
+message command = csh \-c \*(Aqxedit %s;rm %s\*(Aq &
 .fi
 .if n \{\
 .RE
@@ -6504,11 +6513,11 @@
 .sp
 This delivers the message using
 xedit, then removes it afterwards\&.
-\fINOTE THAT IT IS VERY IMPORTANT THAT THIS COMMAND RETURN IMMEDIATELY\fR\&. That\'s why I have the \'&\' on the end\&. If it doesn\'t return immediately then your PCs may freeze when sending messages (they should recover after 30 seconds, hopefully)\&.
+\fINOTE THAT IT IS VERY IMPORTANT THAT THIS COMMAND RETURN IMMEDIATELY\fR\&. That\*(Aqs why I have the \*(Aq&\*(Aq on the end\&. If it doesn\*(Aqt return immediately then your PCs may freeze when sending messages (they should recover after 30 seconds, hopefully)\&.
 .sp
 All messages are delivered as the global guest user\&. The command takes the standard substitutions, although
 \fI %u\fR
-won\'t work (\fI%U\fR
+won\*(Aqt work (\fI%U\fR
 may be better in this case)\&.
 .sp
 Apart from the standard substitutions, some additional ones apply\&. In particular:
@@ -6552,19 +6561,19 @@
 .RE
 You could make this command send mail, or whatever else takes your fancy\&. Please let us know of any really interesting ideas you have\&.
 .sp
-Here\'s a way of sending the messages as mail to root:
+Here\*(Aqs a way of sending the messages as mail to root:
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
-message command = /bin/mail \-s \'message from %f on %m\' root < %s; rm %s
+message command = /bin/mail \-s \*(Aqmessage from %f on %m\*(Aq root < %s; rm %s
 .fi
 .if n \{\
 .RE
 .\}
 .sp
-If you don\'t have a message command then the message won\'t be delivered and Samba will tell the sender there was an error\&. Unfortunately WfWg totally ignores the error code and carries on regardless, saying that the message was delivered\&.
+If you don\*(Aqt have a message command then the message won\*(Aqt be delivered and Samba will tell the sender there was an error\&. Unfortunately WfWg totally ignores the error code and carries on regardless, saying that the message was delivered\&.
 .sp
 If you want to silently delete it then try:
 .sp
@@ -6582,7 +6591,7 @@
 \fI\fImessage command\fR\fR\fI = \fR\fI\fR\fI \fR
 .sp
 Example:
-\fI\fImessage command\fR\fR\fI = \fR\fIcsh \-c \'xedit %s; rm %s\' &\fR\fI \fR
+\fI\fImessage command\fR\fR\fI = \fR\fIcsh \-c \*(Aqxedit %s; rm %s\*(Aq &\fR\fI \fR
 .RE
 
 min print space (S)
@@ -6641,7 +6650,7 @@
 .RS 4
 This option tells
 \fBnmbd\fR(8)
-when acting as a WINS server (\m[blue]\fBwins support = yes\fR\m[]) what the minimum \'time to live\' of NetBIOS names that
+when acting as a WINS server (\m[blue]\fBwins support = yes\fR\m[]) what the minimum \*(Aqtime to live\*(Aq of NetBIOS names that
 nmbd
 will grant will be (in seconds)\&. You should never need to change this parameter\&. The default is 6 hours (21600 seconds)\&.
 .sp
@@ -6696,7 +6705,7 @@
 .\" name cache timeout
 .PP
 .RS 4
-Specifies the number of seconds it takes before entries in samba\'s hostname resolve cache time out\&. If the timeout is set to 0\&. the caching is disabled\&.
+Specifies the number of seconds it takes before entries in samba\*(Aqs hostname resolve cache time out\&. If the timeout is set to 0\&. the caching is disabled\&.
 .sp
 Default:
 \fI\fIname cache timeout\fR\fR\fI = \fR\fI660\fR\fI \fR
@@ -6794,7 +6803,7 @@
 This directory will hold a series of named pipes to allow RPC over inter\-process communication\&.
 .sp
 \&.
-	This will allow Samba and other unix processes to interact over DCE/RPC without using TCP/IP\&. Additionally a sub\-directory \'np\' has restricted permissions, and allows a trusted communication channel between Samba processes
+	This will allow Samba and other unix processes to interact over DCE/RPC without using TCP/IP\&. Additionally a sub\-directory \*(Aqnp\*(Aq has restricted permissions, and allows a trusted communication channel between Samba processes
 .sp
 Default:
 \fI\fIncalrpc dir\fR\fR\fI = \fR\fI${prefix}/var/ncalrpc\fR\fI \fR
@@ -6820,7 +6829,7 @@
 .\" netbios name
 .PP
 .RS 4
-This sets the NetBIOS name by which a Samba server is known\&. By default it is the same as the first component of the host\'s DNS name\&. If a machine is a browse server or logon server this name (or the first component of the hosts DNS name) will be the name that these services are advertised under\&.
+This sets the NetBIOS name by which a Samba server is known\&. By default it is the same as the first component of the host\*(Aqs DNS name\&. If a machine is a browse server or logon server this name (or the first component of the hosts DNS name) will be the name that these services are advertised under\&.
 .sp
 There is a bug in Samba\-3 that breaks operation of browsing and access to shares if the netbios name is set to the literal name
 PIPE\&. To avoid this problem, do not name your Samba\-3 server
@@ -6847,7 +6856,7 @@
 .\" nis homedir
 .PP
 .RS 4
-Get the home share server from a NIS map\&. For UNIX systems that use an automounter, the user\'s home directory will often be mounted on a workstation on demand from a remote server\&.
+Get the home share server from a NIS map\&. For UNIX systems that use an automounter, the user\*(Aqs home directory will often be mounted on a workstation on demand from a remote server\&.
 .sp
 When the Samba logon server is not the actual home directory server, but is mounting the home directories via NFS then two network hops would be required to access the users home directory if the logon server told the client to use itself as the SMB server for home directories (one over SMB and one over NFS)\&. This can be very slow\&.
 .sp
@@ -6950,7 +6959,7 @@
 .\" obey pam restrictions
 .PP
 .RS 4
-When Samba 3\&.0 is configured to enable PAM support (i\&.e\&. \-\-with\-pam), this parameter will control whether or not Samba should obey PAM\'s account and session management directives\&. The default behavior is to use PAM for clear text authentication only and to ignore any account or session management\&. Note that Samba always ignores PAM for authentication in the case of
+When Samba 3\&.0 is configured to enable PAM support (i\&.e\&. \-\-with\-pam), this parameter will control whether or not Samba should obey PAM\*(Aqs account and session management directives\&. The default behavior is to use PAM for clear text authentication only and to ignore any account or session management\&. Note that Samba always ignores PAM for authentication in the case of
 \m[blue]\fBencrypt passwords = yes\fR\m[]\&. The reason is that PAM modules cannot support the challenge/response authentication mechanism needed in the presence of SMB password encryption\&.
 .sp
 Default:
@@ -6969,7 +6978,7 @@
 \m[blue]\fBsecurity = share\fR\m[]
 level security\&.
 .sp
-Note that this also means Samba won\'t try to deduce usernames from the service name\&. This can be annoying for the [homes] section\&. To get around this you could use
+Note that this also means Samba won\*(Aqt try to deduce usernames from the service name\&. This can be annoying for the [homes] section\&. To get around this you could use
 user = %S
 which means your
 \fIuser\fR
@@ -7097,7 +7106,7 @@
 .\" pam password change
 .PP
 .RS 4
-With the addition of better PAM support in Samba 2\&.2, this parameter, it is possible to use PAM\'s password change control flag for Samba\&. If enabled, then PAM will be used for password changes when requested by an SMB client instead of the program listed in
+With the addition of better PAM support in Samba 2\&.2, this parameter, it is possible to use PAM\*(Aqs password change control flag for Samba\&. If enabled, then PAM will be used for password changes when requested by an SMB client instead of the program listed in
 \m[blue]\fBpasswd program\fR\m[]\&. It should be possible to enable this without changing your
 \m[blue]\fBpasswd chat\fR\m[]
 parameter for most setups\&.
@@ -7141,7 +7150,7 @@
 .RS 4
 This option allows the administrator to chose which backend will be used for storing user and possibly group information\&. This allows you to swap between different storage mechanisms without recompile\&.
 .sp
-The parameter value is divided into two parts, the backend\'s name, and a \'location\' string that has meaning only to that particular backed\&. These are separated by a : character\&.
+The parameter value is divided into two parts, the backend\*(Aqs name, and a \*(Aqlocation\*(Aq string that has meaning only to that particular backed\&. These are separated by a : character\&.
 .sp
 Available backends can include:
 .sp
@@ -7221,7 +7230,7 @@
 .\" passdb expand explicit
 .PP
 .RS 4
-This parameter controls whether Samba substitutes %\-macros in the passdb fields if they are explicitly set\&. We used to expand macros here, but this turned out to be a bug because the Windows client can expand a variable %G_osver% in which %G would have been substituted by the user\'s primary group\&.
+This parameter controls whether Samba substitutes %\-macros in the passdb fields if they are explicitly set\&. We used to expand macros here, but this turned out to be a bug because the Windows client can expand a variable %G_osver% in which %G would have been substituted by the user\*(Aqs primary group\&.
 .sp
 Default:
 \fI\fIpassdb expand explicit\fR\fR\fI = \fR\fIno\fR\fI \fR
@@ -7269,7 +7278,7 @@
 \fI"chat"\fR
 conversation that takes places between
 \fBsmbd\fR(8)
-and the local password changing program to change the user\'s password\&. The string describes a sequence of response\-receive pairs that
+and the local password changing program to change the user\*(Aqs password\&. The string describes a sequence of response\-receive pairs that
 \fBsmbd\fR(8)
 uses to determine what to send to the
 \m[blue]\fBpasswd program\fR\m[]
@@ -7282,7 +7291,7 @@
 parameter is set to
 \fByes\fR\&. This sequence is then called
 \fIAS ROOT\fR
-when the SMB password in the smbpasswd file is being changed, without access to the old password cleartext\&. This means that root must be able to reset the user\'s password without knowing the text of the previous password\&. In the presence of NIS/YP, this means that the
+when the SMB password in the smbpasswd file is being changed, without access to the old password cleartext\&. This means that root must be able to reset the user\*(Aqs password without knowing the text of the previous password\&. In the presence of NIS/YP, this means that the
 \m[blue]\fBpasswd program\fR\m[]
 must be executed on the NIS master\&.
 .sp
@@ -7290,7 +7299,7 @@
 \fI%n\fR
 which is substituted for the new password\&. The old passsword (\fI%o\fR) is only available when
 \m[blue]\fBencrypt passwords\fR\m[]
-has been disabled\&. The chat sequence can also contain the standard macros \en, \er, \et and \es to give line\-feed, carriage\-return, tab and space\&. The chat sequence string can also contain a \'*\' which matches any sequence of characters\&. Double quotes can be used to collect strings with spaces in them into a single string\&.
+has been disabled\&. The chat sequence can also contain the standard macros \en, \er, \et and \es to give line\-feed, carriage\-return, tab and space\&. The chat sequence string can also contain a \*(Aq*\*(Aq which matches any sequence of characters\&. Double quotes can be used to collect strings with spaces in them into a single string\&.
 .sp
 If the send string in any part of the chat sequence is a full stop "\&.", then no string is sent\&. Similarly, if the expect string is a full stop then no string is expected\&.
 .sp
@@ -7398,15 +7407,15 @@
 or
 \fBads\fR, then this option
 \fIshould not\fR
-be used, as the default \'*\' indicates to Samba to determine the best DC to contact dynamically, just as all other hosts in an AD domain do\&. This allows the domain to be maintained without modification to the smb\&.conf file\&. The cryptograpic protection on the authenticated RPC calls used to verify passwords ensures that this default is safe\&.
+be used, as the default \*(Aq*\*(Aq indicates to Samba to determine the best DC to contact dynamically, just as all other hosts in an AD domain do\&. This allows the domain to be maintained without modification to the smb\&.conf file\&. The cryptograpic protection on the authenticated RPC calls used to verify passwords ensures that this default is safe\&.
 .sp
-\fIIt is strongly recommended that you use the default of \'*\'\fR, however if in your particular environment you have reason to specify a particular DC list, then the list of machines in this option must be a list of names or IP addresses of Domain controllers for the Domain\&. If you use the default of \'*\', or list several hosts in the
+\fIIt is strongly recommended that you use the default of \*(Aq*\*(Aq\fR, however if in your particular environment you have reason to specify a particular DC list, then the list of machines in this option must be a list of names or IP addresses of Domain controllers for the Domain\&. If you use the default of \*(Aq*\*(Aq, or list several hosts in the
 \fIpassword server\fR
 option then
 smbd
 will try each in turn till it finds one that responds\&. This is useful in case your primary server goes down\&.
 .sp
-If the list of servers contains both names/IP\'s and the \'*\' character, the list is treated as a list of preferred domain controllers, but an auto lookup of all remaining DC\'s will be added to the list as well\&. Samba will not attempt to optimize this list by locating the closest DC\&.
+If the list of servers contains both names/IP\*(Aqs and the \*(Aq*\*(Aq character, the list is treated as a list of preferred domain controllers, but an auto lookup of all remaining DC\*(Aqs will be added to the list as well\&. Samba will not attempt to optimize this list by locating the closest DC\&.
 .sp
 If parameter is a name, it is looked up using the parameter
 \m[blue]\fBname resolve order\fR\m[]
@@ -7479,7 +7488,7 @@
 .IP \(bu 2.3
 .\}
 Using a password server means your UNIX box (running Samba) is only as secure as (a host masqurading as) your password server\&.
-\fIDO NOT CHOOSE A PASSWORD SERVER THAT YOU DON\'T COMPLETELY TRUST\fR\&.
+\fIDO NOT CHOOSE A PASSWORD SERVER THAT YOU DON\*(AqT COMPLETELY TRUST\fR\&.
 .RE
 .sp
 .RS 4
@@ -7530,7 +7539,7 @@
 .RS 4
 This parameter specifies a directory to which the user of the service is to be given access\&. In the case of printable services, this is where print data will spool prior to being submitted to the host for printing\&.
 .sp
-For a printable service offering guest access, the service should be readonly and the path should be world\-writeable and have the sticky bit set\&. This is not mandatory of course, but you probably won\'t get the results you expect if you do otherwise\&.
+For a printable service offering guest access, the service should be readonly and the path should be world\-writeable and have the sticky bit set\&. This is not mandatory of course, but you probably won\*(Aqt get the results you expect if you do otherwise\&.
 .sp
 Any occurrences of
 \fI%u\fR
@@ -7629,7 +7638,7 @@
 An interesting example is to send the users a welcome message every time they log in\&. Maybe a message of the day? Here is an example:
 .sp
 
-preexec = csh \-c \'echo \e"Welcome to %S!\e" | /usr/local/samba/bin/smbclient \-M %m \-I %I\' &
+preexec = csh \-c \*(Aqecho \e"Welcome to %S!\e" | /usr/local/samba/bin/smbclient \-M %m \-I %I\*(Aq &
 .sp
 Of course, this could get annoying after a while :\-)
 .sp
@@ -7818,7 +7827,7 @@
 .RE
 .\}
 .sp
-where the \'|\' separates aliases of a printer\&. The fact that the second alias has a space in it gives a hint to Samba that it\'s a comment\&.
+where the \*(Aq|\*(Aq separates aliases of a printer\&. The fact that the second alias has a space in it gives a hint to Samba that it\*(Aqs a comment\&.
 .if n \{\
 .sp
 .\}
@@ -7852,7 +7861,7 @@
 .RS 4
 After a print job has finished spooling to a service, this command will be used via a
 system()
-call to process the spool file\&. Typically the command specified will submit the spool file to the host\'s printing subsystem, but there is no requirement that this be the case\&. The server will not remove the spool file, so whatever command you specify should remove the spool file when it has been processed, otherwise you will need to manually remove old spool files\&.
+call to process the spool file\&. Typically the command specified will submit the spool file to the host\*(Aqs printing subsystem, but there is no requirement that this be the case\&. The server will not remove the spool file, so whatever command you specify should remove the spool file when it has been processed, otherwise you will need to manually remove old spool files\&.
 .sp
 The print command is simply a text string\&. It will be used verbatim after macro substitutions have been made:
 .sp
@@ -7888,7 +7897,7 @@
 \m[blue]\fBguest account\fR\m[]
 in the [global] section\&.
 .sp
-You can form quite complex print commands by realizing that they are just passed to a shell\&. For example the following will log a print job, print the file, then remove it\&. Note that \';\' is the usual separator for command in shell scripts\&.
+You can form quite complex print commands by realizing that they are just passed to a shell\&. For example the following will log a print job, print the file, then remove it\&. Note that \*(Aq;\*(Aq is the usual separator for command in shell scripts\&.
 .sp
 print command = echo Printing %s >> /tmp/print\&.log; lpr \-P %p %s; rm %s
 .sp
@@ -8136,7 +8145,7 @@
 \m[blue]\fBwriteable\fR\m[]\&.
 .sp
 If this parameter is
-\fByes\fR, then users of a service may not create or modify files in the service\'s directory\&.
+\fByes\fR, then users of a service may not create or modify files in the service\*(Aqs directory\&.
 .sp
 Note that a printable service (printable = yes) will
 \fIALWAYS\fR
@@ -8207,7 +8216,7 @@
 \fBnmbd\fR(8)
 to periodically announce itself to arbitrary IP addresses with an arbitrary workgroup name\&.
 .sp
-This is useful if you want your Samba server to appear in a remote workgroup for which the normal browse propagation rules don\'t work\&. The remote workgroup can be anywhere that you can send IP packets to\&.
+This is useful if you want your Samba server to appear in a remote workgroup for which the normal browse propagation rules don\*(Aqt work\&. The remote workgroup can be anywhere that you can send IP packets to\&.
 .sp
 For example:
 .sp
@@ -8243,7 +8252,7 @@
 \fBnmbd\fR(8)
 to periodically request synchronization of browse lists with the master browser of a Samba server that is on a remote segment\&. This option will allow you to gain browse lists for multiple workgroups across routed networks\&. This is done in a manner that does not work with any non\-Samba servers\&.
 .sp
-This is useful if you want your Samba server and all local clients to appear in a remote workgroup for which the normal browse propagation rules don\'t work\&. The remote workgroup can be anywhere that you can send IP packets to\&.
+This is useful if you want your Samba server and all local clients to appear in a remote workgroup for which the normal browse propagation rules don\*(Aqt work\&. The remote workgroup can be anywhere that you can send IP packets to\&.
 .sp
 For example:
 .sp
@@ -8482,7 +8491,7 @@
 .RS 4
 This parameter controls what UNIX permission bits will be set when a Windows NT client is manipulating the UNIX permission on a file using the native NT security dialog box\&.
 .sp
-This parameter is applied as a mask (AND\'ed with) to the incoming permission bits, thus resetting any bits not in this mask\&. Make sure not to mix up this parameter with
+This parameter is applied as a mask (AND\*(Aqed with) to the incoming permission bits, thus resetting any bits not in this mask\&. Make sure not to mix up this parameter with
 \m[blue]\fBforce security mode\fR\m[], which works in a manner similar to this one but uses a logical OR instead of an AND\&.
 .sp
 Essentially, all bits set to zero in this mask will result in setting to zero the corresponding bits on the file permissions regardless of the previous status of this bits on the file\&.
@@ -8557,7 +8566,7 @@
 \fINote\fR
 that the name of the resource being requested is
 \fInot\fR
-sent to the server until after the server has successfully authenticated the client\&. This is why guest shares don\'t work in user level security without allowing the server to automatically map unknown users into the
+sent to the server until after the server has successfully authenticated the client\&. This is why guest shares don\*(Aqt work in user level security without allowing the server to automatically map unknown users into the
 \m[blue]\fBguest account\fR\m[]\&. See the
 \m[blue]\fBmap to guest\fR\m[]
 parameter for details on doing this\&.
@@ -8578,7 +8587,7 @@
 that a valid UNIX user must still exist as well as the account on the Domain Controller to allow Samba to have a valid UNIX account to map file access to\&.
 .sp
 \fINote\fR
-that from the client\'s point of view
+that from the client\*(Aqs point of view
 security = domain
 is the same as
 security = user\&. It only affects how the server deals with the authentication, it does not in any way affect what the client sees\&.
@@ -8586,7 +8595,7 @@
 \fINote\fR
 that the name of the resource being requested is
 \fInot\fR
-sent to the server until after the server has successfully authenticated the client\&. This is why guest shares don\'t work in user level security without allowing the server to automatically map unknown users into the
+sent to the server until after the server has successfully authenticated the client\&. This is why guest shares don\*(Aqt work in user level security without allowing the server to automatically map unknown users into the
 \m[blue]\fBguest account\fR\m[]\&. See the
 \m[blue]\fBmap to guest\fR\m[]
 parameter for details on doing this\&.
@@ -8746,7 +8755,7 @@
 \fBNote\fR
 .ps -1
 .br
-This mode of operation has significant pitfalls since it is more vulnerable to man\-in\-the\-middle attacks and server impersonation\&. In particular, this mode of operation can cause significant resource consumption on the PDC, as it must maintain an active connection for the duration of the user\'s session\&. Furthermore, if this connection is lost, there is no way to reestablish it, and further authentications to the Samba server may fail (from a single client, till it disconnects)\&.
+This mode of operation has significant pitfalls since it is more vulnerable to man\-in\-the\-middle attacks and server impersonation\&. In particular, this mode of operation can cause significant resource consumption on the PDC, as it must maintain an active connection for the duration of the user\*(Aqs session\&. Furthermore, if this connection is lost, there is no way to reestablish it, and further authentications to the Samba server may fail (from a single client, till it disconnects)\&.
 .sp .5v
 .RE
 .if n \{\
@@ -8777,7 +8786,7 @@
 \fBNote\fR
 .ps -1
 .br
-From the client\'s point of view,
+From the client\*(Aqs point of view,
 security = server
 is the same as
 security = user\&. It only affects how the server deals with the authentication, it does not in any way affect what the client sees\&.
@@ -8801,7 +8810,7 @@
 \fINote\fR
 that the name of the resource being requested is
 \fInot\fR
-sent to the server until after the server has successfully authenticated the client\&. This is why guest shares don\'t work in user level security without allowing the server to automatically map unknown users into the
+sent to the server until after the server has successfully authenticated the client\&. This is why guest shares don\*(Aqt work in user level security without allowing the server to automatically map unknown users into the
 \m[blue]\fBguest account\fR\m[]\&. See the
 \m[blue]\fBmap to guest\fR\m[]
 parameter for details on doing this\&.
@@ -8840,7 +8849,7 @@
 .sp
 If enabled, Samba can attempt to help clients to use Kerberos to contact it, even when known only by IP address or a name not registered with our KDC as a service principal name\&. Kerberos relies on names, so ordinarily cannot function in this situation\&.
 .sp
-If disabled, Samba will send the string not_defined_in_RFC4178 at please_ignore as the \'rfc4178 hint\', following the updated RFC and Windows 2008 behaviour in this area\&.
+If disabled, Samba will send the string not_defined_in_RFC4178 at please_ignore as the \*(Aqrfc4178 hint\*(Aq, following the updated RFC and Windows 2008 behaviour in this area\&.
 .sp
 Note that Windows XP SP2 and later versions already ignored this value in all circumstances\&.
 .sp
@@ -8948,7 +8957,7 @@
 \fI\fIset primary group script\fR\fR\fI = \fR\fI\fR\fI \fR
 .sp
 Example:
-\fI\fIset primary group script\fR\fR\fI = \fR\fI/usr/sbin/usermod \-g \'%g\' \'%u\'\fR\fI \fR
+\fI\fIset primary group script\fR\fR\fI = \fR\fI/usr/sbin/usermod \-g \*(Aq%g\*(Aq \*(Aq%u\*(Aq\fR\fI \fR
 .RE
 
 set quota command (G)
@@ -9549,8 +9558,8 @@
 .sp
 .RE
 Those marked with a
-\fI\'*\'\fR
-take an integer argument\&. The others can optionally take a 1 or 0 argument to enable or disable the option, by default they will be enabled if you don\'t specify 1 or 0\&.
+\fI\*(Aq*\*(Aq\fR
+take an integer argument\&. The others can optionally take a 1 or 0 argument to enable or disable the option, by default they will be enabled if you don\*(Aqt specify 1 or 0\&.
 .sp
 To specify an argument use the syntax SOME_OPTION = VALUE for example
 SO_SNDBUF = 8192\&. Note that you must not have any spaces before or after the = sign\&.
@@ -9633,9 +9642,9 @@
 \fByes\fR
 the server will change from UNIX behaviour of not committing real disk storage blocks when a file is extended to the Windows behaviour of actually forcing the disk system to allocate real storage blocks when a file is created or extended to be a given size\&. In UNIX terminology this means that Samba will stop creating sparse files\&.
 .sp
-This option is really desgined for file systems that support fast allocation of large numbers of blocks such as extent\-based file systems\&. On file systems that don\'t support extents (most notably ext3) this can make Samba slower\&. When you work with large files over >100MB on file systems without extents you may even run into problems with clients running into timeouts\&.
+This option is really desgined for file systems that support fast allocation of large numbers of blocks such as extent\-based file systems\&. On file systems that don\*(Aqt support extents (most notably ext3) this can make Samba slower\&. When you work with large files over >100MB on file systems without extents you may even run into problems with clients running into timeouts\&.
 .sp
-When you have an extent based filesystem it\'s likely that we can make use of unwritten extents which allows Samba to allocate even large amounts of space very fast and you will not see any timeout problems caused by strict allocate\&. With strict allocate in use you will also get much better out of quota messages in case you use quotas\&. Another advantage of activating this setting is that it will help to reduce file fragmentation\&.
+When you have an extent based filesystem it\*(Aqs likely that we can make use of unwritten extents which allows Samba to allocate even large amounts of space very fast and you will not see any timeout problems caused by strict allocate\&. With strict allocate in use you will also get much better out of quota messages in case you use quotas\&. Another advantage of activating this setting is that it will help to reduce file fragmentation\&.
 .sp
 To give you an idea on which filesystems this setting might currently be a good option for you: XFS, ext4, btrfs, ocfs2 on Linux and JFS2 on AIX support unwritten extents\&. On Filesystems that do not support it, preallocation is probably an expensive operation where you will see reduced performance and risk to let clients run into timeouts when creating large files\&. Examples are ext3, ZFS, HFS+ and most others, so be aware if you activate this setting on those filesystems\&.
 .sp
@@ -9686,7 +9695,7 @@
 .sp
 The administrator must create a directory name
 svcctl
-in Samba\'s $(libdir) and create symbolic links to the init scripts in
+in Samba\*(Aqs $(libdir) and create symbolic links to the init scripts in
 /etc/init\&.d/\&. The name of the links must match the names given as part of the
 \fIsvcctl list\fR\&.
 .sp
@@ -9703,7 +9712,7 @@
 .RS 4
 This is a boolean parameter that controls whether writes will always be written to stable storage before the write call returns\&. If this is
 \fBno\fR
-then the server will be guided by the client\'s request in each write call (clients can set a bit indicating that a particular write should be synchronous)\&. If this is
+then the server will be guided by the client\*(Aqs request in each write call (clients can set a bit indicating that a particular write should be synchronous)\&. If this is
 \fByes\fR
 then every write will be followed by a
 fsync()
@@ -9755,9 +9764,9 @@
 \fBwinbindd\fR(8)
 daemon uses this parameter to fill in the home directory for that user\&. If the string
 \fI%D\fR
-is present it is substituted with the user\'s Windows NT domain name\&. If the string
+is present it is substituted with the user\*(Aqs Windows NT domain name\&. If the string
 \fI%U\fR
-is present it is substituted with the user\'s Windows NT user name\&.
+is present it is substituted with the user\*(Aqs Windows NT user name\&.
 .sp
 Default:
 \fI\fItemplate homedir\fR\fR\fI = \fR\fI/home/%D/%U\fR\fI \fR
@@ -9894,7 +9903,7 @@
 .\" username level
 .PP
 .RS 4
-This option helps Samba to try and \'guess\' at the real UNIX username, as many DOS clients send an all\-uppercase username\&. By default Samba tries all lowercase, followed by the username with the first letter capitalized, and fails if the username is not found on the UNIX machine\&.
+This option helps Samba to try and \*(Aqguess\*(Aq at the real UNIX username, as many DOS clients send an all\-uppercase username\&. By default Samba tries all lowercase, followed by the username with the first letter capitalized, and fails if the username is not found on the UNIX machine\&.
 .sp
 If this parameter is set to non\-zero the behavior changes\&. This parameter is a number that specifies the number of uppercase combinations to try while trying to determine the UNIX user name\&. The higher the number the more combinations will be tried, but the slower the discovery of usernames will be\&. Use this parameter when you have strange usernames on your UNIX machine, such as
 \fBAstrangeUser \fR\&.
@@ -9955,13 +9964,13 @@
 Please note that for user or share mode security, the username map is applied prior to validating the user credentials\&. Domain member servers (domain or ads) apply the username map after the user has been successfully authenticated by the domain controller and require fully qualified enties in the map table (e\&.g\&. biddle =
 DOMAIN\efoo)\&.
 .sp
-The map file is parsed line by line\&. Each line should contain a single UNIX username on the left then a \'=\' followed by a list of usernames on the right\&. The list of usernames on the right may contain names of the form @group in which case they will match any UNIX username in that group\&. The special client name \'*\' is a wildcard and matches any name\&. Each line of the map file may be up to 1023 characters long\&.
+The map file is parsed line by line\&. Each line should contain a single UNIX username on the left then a \*(Aq=\*(Aq followed by a list of usernames on the right\&. The list of usernames on the right may contain names of the form @group in which case they will match any UNIX username in that group\&. The special client name \*(Aq*\*(Aq is a wildcard and matches any name\&. Each line of the map file may be up to 1023 characters long\&.
 .sp
-The file is processed on each line by taking the supplied username and comparing it with each username on the right hand side of the \'=\' signs\&. If the supplied name matches any of the names on the right hand side then it is replaced with the name on the left\&. Processing then continues with the next line\&.
+The file is processed on each line by taking the supplied username and comparing it with each username on the right hand side of the \*(Aq=\*(Aq signs\&. If the supplied name matches any of the names on the right hand side then it is replaced with the name on the left\&. Processing then continues with the next line\&.
 .sp
-If any line begins with a \'#\' or a \';\' then it is ignored\&.
+If any line begins with a \*(Aq#\*(Aq or a \*(Aq;\*(Aq then it is ignored\&.
 .sp
-If any line begins with an \'!\' then the processing will stop after that line if a mapping was done by the line\&. Otherwise mapping continues with every line being processed\&. Using \'!\' is most useful when you have a wildcard mapping line later in the file\&.
+If any line begins with an \*(Aq!\*(Aq then the processing will stop after that line if a mapping was done by the line\&. Otherwise mapping continues with every line being processed\&. Using \*(Aq!\*(Aq is most useful when you have a wildcard mapping line later in the file\&.
 .sp
 For example to map from the name
 \fBadmin\fR
@@ -10017,7 +10026,7 @@
 .sp
 would map the windows username "Andrew Tridgell" to the unix username "tridge"\&.
 .sp
-The following example would map mary and fred to the unix user sys, and map the rest to guest\&. Note the use of the \'!\' to tell Samba to stop processing if it gets a match on that line:
+The following example would map mary and fred to the unix user sys, and map the rest to guest\&. Note the use of the \*(Aq!\*(Aq to tell Samba to stop processing if it gets a match on that line:
 .sp
 .if n \{\
 .RS 4
@@ -10041,7 +10050,7 @@
 \m[blue]\fBpassword server\fR\m[]
 (if you have one)\&. The password server will receive whatever username the client supplies without modification\&.
 .sp
-Also note that no reverse mapping is done\&. The main effect this has is with printing\&. Users who have been mapped may have trouble deleting print jobs as PrintManager under WfWg will think they don\'t own the print job\&.
+Also note that no reverse mapping is done\&. The main effect this has is with printing\&. Users who have been mapped may have trouble deleting print jobs as PrintManager under WfWg will think they don\*(Aqt own the print job\&.
 .sp
 Samba versions prior to 3\&.0\&.8 would only support reading the fully qualified username (e\&.g\&.:
 DOMAIN\euser) from the username map when performing a kerberos login from a client\&. However, when looking up a map entry for a user authenticated by NTLM[SSP], only the login name would be used for matches\&. This resulted in inconsistent behavior sometimes even on the same server\&.
@@ -10107,11 +10116,11 @@
 \m[blue]\fBvalid users\fR\m[]
 parameter\&.
 .sp
-If any of the usernames begin with a \'@\' then the name will be looked up first in the NIS netgroups list (if Samba is compiled with netgroup support), followed by a lookup in the UNIX groups database and will expand to a list of all users in the group of that name\&.
+If any of the usernames begin with a \*(Aq@\*(Aq then the name will be looked up first in the NIS netgroups list (if Samba is compiled with netgroup support), followed by a lookup in the UNIX groups database and will expand to a list of all users in the group of that name\&.
 .sp
-If any of the usernames begin with a \'+\' then the name will be looked up only in the UNIX groups database and will expand to a list of all users in the group of that name\&.
+If any of the usernames begin with a \*(Aq+\*(Aq then the name will be looked up only in the UNIX groups database and will expand to a list of all users in the group of that name\&.
 .sp
-If any of the usernames begin with a \'&\' then the name will be looked up only in the NIS netgroups database (if Samba is compiled with netgroup support) and will expand to a list of all users in the netgroup group of that name\&.
+If any of the usernames begin with a \*(Aq&\*(Aq then the name will be looked up only in the NIS netgroups database (if Samba is compiled with netgroup support) and will expand to a list of all users in the netgroup group of that name\&.
 .sp
 Note that searching though a groups database can take quite some time, and some clients may time out during the search\&.
 .sp
@@ -10190,7 +10199,7 @@
 .\" usershare prefix allow list
 .PP
 .RS 4
-This parameter specifies a list of absolute pathnames the root of which are allowed to be exported by user defined share definitions\&. If the pathname to be exported doesn\'t start with one of the strings in this list, the user defined share will not be allowed\&. This allows the Samba administrator to restrict the directories on the system that can be exported by user defined shares\&.
+This parameter specifies a list of absolute pathnames the root of which are allowed to be exported by user defined share definitions\&. If the pathname to be exported doesn\*(Aqt start with one of the strings in this list, the user defined share will not be allowed\&. This allows the Samba administrator to restrict the directories on the system that can be exported by user defined shares\&.
 .sp
 If there is a "usershare prefix deny list" and also a "usershare prefix allow list" the deny list is processed first, followed by the allow list, thus leading to the most restrictive interpretation\&.
 .sp
@@ -10238,7 +10247,7 @@
 If this parameter is
 \fByes\fR, and the
 \fBsendfile()\fR
-system call is supported by the underlying operating system, then some SMB read calls (mainly ReadAndX and ReadRaw) will use the more efficient sendfile system call for files that are exclusively oplocked\&. This may make more efficient use of the system CPU\'s and cause Samba to be faster\&. Samba automatically turns this off for clients that use protocol levels lower than NT LM 0\&.12 and when it detects a client is Windows 9x (using sendfile from Linux will cause these clients to fail)\&.
+system call is supported by the underlying operating system, then some SMB read calls (mainly ReadAndX and ReadRaw) will use the more efficient sendfile system call for files that are exclusively oplocked\&. This may make more efficient use of the system CPU\*(Aqs and cause Samba to be faster\&. Samba automatically turns this off for clients that use protocol levels lower than NT LM 0\&.12 and when it detects a client is Windows 9x (using sendfile from Linux will cause these clients to fail)\&.
 .sp
 Default:
 \fI\fIuse sendfile\fR\fR\fI = \fR\fIfalse\fR\fI \fR
@@ -10291,7 +10300,7 @@
 .\" valid users
 .PP
 .RS 4
-This is a list of users that should be allowed to login to this service\&. Names starting with \'@\', \'+\' and \'&\' are interpreted using the same rules as described in the
+This is a list of users that should be allowed to login to this service\&. Names starting with \*(Aq@\*(Aq, \*(Aq+\*(Aq and \*(Aq&\*(Aq are interpreted using the same rules as described in the
 \fIinvalid users\fR
 parameter\&.
 .sp
@@ -10325,17 +10334,17 @@
 .\" veto files
 .PP
 .RS 4
-This is a list of files and directories that are neither visible nor accessible\&. Each entry in the list must be separated by a \'/\', which allows spaces to be included in the entry\&. \'*\' and \'?\' can be used to specify multiple files or directories as in DOS wildcards\&.
+This is a list of files and directories that are neither visible nor accessible\&. Each entry in the list must be separated by a \*(Aq/\*(Aq, which allows spaces to be included in the entry\&. \*(Aq*\*(Aq and \*(Aq?\*(Aq can be used to specify multiple files or directories as in DOS wildcards\&.
 .sp
 Each entry must be a unix path, not a DOS path and must
 \fInot\fR
-include the unix directory separator \'/\'\&.
+include the unix directory separator \*(Aq/\*(Aq\&.
 .sp
 Note that the
 \m[blue]\fBcase sensitive\fR\m[]
 option is applicable in vetoing files\&.
 .sp
-One feature of the veto files parameter that it is important to be aware of is Samba\'s behaviour when trying to delete a directory\&. If a directory that is to be deleted contains nothing but veto files this deletion will
+One feature of the veto files parameter that it is important to be aware of is Samba\*(Aqs behaviour when trying to delete a directory\&. If a directory that is to be deleted contains nothing but veto files this deletion will
 \fIfail\fR
 unless you also set the
 \m[blue]\fBdelete veto files\fR\m[]
@@ -10583,7 +10592,7 @@
 .\" winbind nested groups
 .PP
 .RS 4
-If set to yes, this parameter activates the support for nested groups\&. Nested groups are also called local groups or aliases\&. They work like their counterparts in Windows: Nested groups are defined locally on any machine (they are shared between DC\'s through their SAM) and can contain users and global groups from any trusted SAM\&. To be able to use nested groups, you need to run nss_winbind\&.
+If set to yes, this parameter activates the support for nested groups\&. Nested groups are also called local groups or aliases\&. They work like their counterparts in Windows: Nested groups are defined locally on any machine (they are shared between DC\*(Aqs through their SAM) and can contain users and global groups from any trusted SAM\&. To be able to use nested groups, you need to run nss_winbind\&.
 .sp
 Default:
 \fI\fIwinbind nested groups\fR\fR\fI = \fR\fIyes\fR\fI \fR
@@ -10608,7 +10617,7 @@
 .\" winbind nss info
 .PP
 .RS 4
-This parameter is designed to control how Winbind retrieves Name Service Information to construct a user\'s home directory and login shell\&. Currently the following settings are available:
+This parameter is designed to control how Winbind retrieves Name Service Information to construct a user\*(Aqs home directory and login shell\&. Currently the following settings are available:
 .sp
 .RS 4
 .ie n \{\
@@ -10716,7 +10725,7 @@
 Please note that setting this parameter to + causes problems with group membership at least on glibc systems, as the character + is used as a special character for NIS in /etc/group\&.
 .sp
 Default:
-\fI\fIwinbind separator\fR\fR\fI = \fR\fI\'\e\'\fR\fI \fR
+\fI\fIwinbind separator\fR\fR\fI = \fR\fI\*(Aq\e\*(Aq\fR\fI \fR
 .sp
 Example:
 \fI\fIwinbind separator\fR\fR\fI = \fR\fI+\fR\fI \fR
@@ -10726,7 +10735,7 @@
 .\" winbind trusted domains only
 .PP
 .RS 4
-This parameter is designed to allow Samba servers that are members of a Samba controlled domain to use UNIX accounts distributed via NIS, rsync, or LDAP as the uid\'s for winbindd users in the hosts primary domain\&. Therefore, the user
+This parameter is designed to allow Samba servers that are members of a Samba controlled domain to use UNIX accounts distributed via NIS, rsync, or LDAP as the uid\*(Aqs for winbindd users in the hosts primary domain\&. Therefore, the user
 DOMAIN\euser1
 would be mapped to the account user1 in /etc/passwd instead of allocating a new uid for him or her\&.
 .sp
@@ -10744,7 +10753,7 @@
 .RS 4
 This parameter specifies whether the
 \fBwinbindd\fR(8)
-daemon should operate on users without domain component in their username\&. Users without a domain component are treated as is part of the winbindd server\'s own domain\&. While this does not benefit Windows users, it makes SSH, FTP and e\-mail function in a way much closer to the way they would in a native unix system\&.
+daemon should operate on users without domain component in their username\&. Users without a domain component are treated as is part of the winbindd server\*(Aqs own domain\&. While this does not benefit Windows users, it makes SSH, FTP and e\-mail function in a way much closer to the way they would in a native unix system\&.
 .sp
 This option should be avoided if possible\&. It can cause confusion about responsibilities for a user or group\&. In many situations it is not clear whether winbind or /etc/passwd should be seen as authoritative for a user, likewise for groups\&.
 .sp
@@ -10848,11 +10857,11 @@
 .RS 4
 This specifies the IP address (or DNS name: IP address for preference) of the WINS server that
 \fBnmbd\fR(8)
-should register with\&. If you have a WINS server on your network then you should set this to the WINS server\'s IP\&.
+should register with\&. If you have a WINS server on your network then you should set this to the WINS server\*(Aqs IP\&.
 .sp
 You should point this at your WINS server if you have a multi\-subnetted network\&.
 .sp
-If you want to work in multiple namespaces, you can give every wins server a \'tag\'\&. For each tag, only one (working) server will be queried for a name\&. The tag should be separated from the ip address by a colon\&.
+If you want to work in multiple namespaces, you can give every wins server a \*(Aqtag\*(Aq\&. For each tag, only one (working) server will be queried for a name\&. The tag should be separated from the ip address by a colon\&.
 .if n \{\
 .sp
 .\}
@@ -10874,7 +10883,7 @@
 \fI\fIwins server\fR\fR\fI = \fR\fI\fR\fI \fR
 .sp
 Example:
-\fI\fIwins server\fR\fR\fI = \fR\fImary:192\&.9\&.200\&.1 fred:192\&.168\&.3\&.199 mary:192\&.168\&.2\&.61 # For this example when querying a certain name, 192\&.19\&.200\&.1 will be asked first and if that doesn\'t respond 192\&.168\&.2\&.61\&. If either of those doesn\'t know the name 192\&.168\&.3\&.199 will be queried\&.\fR\fI \fR
+\fI\fIwins server\fR\fR\fI = \fR\fImary:192\&.9\&.200\&.1 fred:192\&.168\&.3\&.199 mary:192\&.168\&.2\&.61 # For this example when querying a certain name, 192\&.19\&.200\&.1 will be asked first and if that doesn\*(Aqt respond 192\&.168\&.2\&.61\&. If either of those doesn\*(Aqt know the name 192\&.168\&.3\&.199 will be queried\&.\fR\fI \fR
 .sp
 Example:
 \fI\fIwins server\fR\fR\fI = \fR\fI192\&.9\&.200\&.1 192\&.168\&.2\&.61\fR\fI \fR
@@ -10978,7 +10987,7 @@
 .\" write raw
 .PP
 .RS 4
-This parameter controls whether or not the server will support raw write SMB\'s when transferring data from clients\&. You should never need to change this parameter\&.
+This parameter controls whether or not the server will support raw write SMB\*(Aqs when transferring data from clients\&. You should never need to change this parameter\&.
 .sp
 Default:
 \fI\fIwrite raw\fR\fR\fI = \fR\fIyes\fR\fI \fR
@@ -11003,7 +11012,7 @@
 .RE
 .SH "WARNINGS"
 .PP
-Although the configuration file permits service names to contain spaces, your client software may not\&. Spaces will be ignored in comparisons anyway, so it shouldn\'t be a problem \- but be aware of the possibility\&.
+Although the configuration file permits service names to contain spaces, your client software may not\&. Spaces will be ignored in comparisons anyway, so it shouldn\*(Aqt be a problem \- but be aware of the possibility\&.
 .PP
 On a similar note, many clients \- especially DOS clients \- limit service names to eight characters\&.
 \fBsmbd\fR(8)

Modified: trunk/samba/docs/manpages/smbcacls.1
===================================================================
--- trunk/samba/docs/manpages/smbcacls.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/smbcacls.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smbcacls
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCACLS" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBCACLS" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -90,7 +99,7 @@
 .PP
 \-t|\-\-test\-args
 .RS 4
-Don\'t actually do anything, only validate the correctness of the arguments\&.
+Don\*(Aqt actually do anything, only validate the correctness of the arguments\&.
 .RE
 .PP
 \-h|\-\-help
@@ -354,7 +363,7 @@
 .IP \(bu 2.3
 .\}
 \fIREAD\fR
-\- Equivalent to \'RX\' permissions
+\- Equivalent to \*(AqRX\*(Aq permissions
 .RE
 .sp
 .RS 4
@@ -366,7 +375,7 @@
 .IP \(bu 2.3
 .\}
 \fICHANGE\fR
-\- Equivalent to \'RXWD\' permissions
+\- Equivalent to \*(AqRXWD\*(Aq permissions
 .RE
 .sp
 .RS 4
@@ -378,7 +387,7 @@
 .IP \(bu 2.3
 .\}
 \fIFULL\fR
-\- Equivalent to \'RWXDPO\' permissions
+\- Equivalent to \*(AqRWXDPO\*(Aq permissions
 .RE
 .SH "EXIT STATUS"
 .PP
@@ -388,7 +397,7 @@
 .PP
 If the operation succeeded, smbcacls returns and exit status of 0\&. If
 smbcacls
-couldn\'t connect to the specified server, or there was an error getting or setting the ACLs, an exit status of 1 is returned\&. If there was an error parsing any command line arguments, an exit status of 2 is returned\&.
+couldn\*(Aqt connect to the specified server, or there was an error getting or setting the ACLs, an exit status of 1 is returned\&. If there was an error parsing any command line arguments, an exit status of 2 is returned\&.
 .SH "VERSION"
 .PP
 This man page is correct for version 3 of the Samba suite\&.

Modified: trunk/samba/docs/manpages/smbclient.1
===================================================================
--- trunk/samba/docs/manpages/smbclient.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/smbclient.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smbclient
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCLIENT" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBCLIENT" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -32,7 +41,7 @@
 suite\&.
 .PP
 smbclient
-is a client that can \'talk\' to an SMB/CIFS server\&. It offers an interface similar to that of the ftp program (see
+is a client that can \*(Aqtalk\*(Aq to an SMB/CIFS server\&. It offers an interface similar to that of the ftp program (see
 \fBftp\fR(1))\&. Operations include things like getting files from the server to the local machine, putting files from the local machine to the server, retrieving directory information from the server and so on\&.
 .SH "OPTIONS"
 .PP
@@ -217,7 +226,7 @@
 .RS 4
 This parameter causes the client to write messages to the standard error stream (stderr) rather than to the standard output stream\&.
 .sp
-By default, the client writes messages to standard output \- typically the user\'s tty\&.
+By default, the client writes messages to standard output \- typically the user\*(Aqs tty\&.
 .RE
 .PP
 \-L|\-\-list
@@ -226,7 +235,7 @@
 smbclient \-L host
 and a list should appear\&. The
 \fI\-I \fR
-option may be useful if your NetBIOS names don\'t match your TCP/IP DNS host names or if you are trying to reach a host on another network\&.
+option may be useful if your NetBIOS names don\*(Aqt match your TCP/IP DNS host names or if you are trying to reach a host on another network\&.
 .RE
 .PP
 \-b|\-\-send\-buffer buffersize
@@ -491,7 +500,7 @@
 .IP \(bu 2.3
 .\}
 \fIr\fR
-\- Regular expression include or exclude\&. Uses regular expression matching for excluding or excluding files if compiled with HAVE_REGEX_H\&. However this mode can be very slow\&. If not compiled with HAVE_REGEX_H, does a limited wildcard match on \'*\' and \'?\'\&.
+\- Regular expression include or exclude\&. Uses regular expression matching for excluding or excluding files if compiled with HAVE_REGEX_H\&. However this mode can be very slow\&. If not compiled with HAVE_REGEX_H, does a limited wildcard match on \*(Aq*\*(Aq and \*(Aq?\*(Aq\&.
 .RE
 .sp
 .RS 4
@@ -527,12 +536,12 @@
 .RE
 \fITar Long File Names\fR
 .sp
-smbclient\'s tar option now supports long file names both on backup and restore\&. However, the full path name of the file must be less than 1024 bytes\&. Also, when a tar archive is created,
-smbclient\'s tar option places all files in the archive with relative names, not absolute names\&.
+smbclient\*(Aqs tar option now supports long file names both on backup and restore\&. However, the full path name of the file must be less than 1024 bytes\&. Also, when a tar archive is created,
+smbclient\*(Aqs tar option places all files in the archive with relative names, not absolute names\&.
 .sp
 \fITar Filenames\fR
 .sp
-All file names can be given as DOS path names (with \'\e\e\' as the component separator) or as UNIX path names (with \'/\' as the component separator)\&.
+All file names can be given as DOS path names (with \*(Aq\e\e\*(Aq as the component separator) or as UNIX path names (with \*(Aq/\*(Aq as the component separator)\&.
 .sp
 \fIExamples\fR
 .sp
@@ -579,7 +588,7 @@
 \fI\-c\fR\&.
 .sp
 This is particularly useful in scripts and for printing stdin to the server, e\&.g\&.
-\-c \'print \-\'\&.
+\-c \*(Aqprint \-\*(Aq\&.
 .RE
 .SH "OPERATIONS"
 .PP
@@ -962,7 +971,7 @@
 .PP
 tarmode <full|inc|reset|noreset>
 .RS 4
-Changes tar\'s behavior with regard to archive bits\&. In full mode, tar will back up everything regardless of the archive bit setting (this is the default mode)\&. In incremental mode, tar will only back up files with the archive bit set\&. In reset mode, tar will reset the archive bit on all files it backs up (implies read/write share)\&.
+Changes tar\*(Aqs behavior with regard to archive bits\&. In full mode, tar will back up everything regardless of the archive bit setting (this is the default mode)\&. In incremental mode, tar will only back up files with the archive bit set\&. In reset mode, tar will reset the archive bit on all files it backs up (implies read/write share)\&.
 .RE
 .PP
 unlock <filenum> <hex\-start> <hex\-len>

Modified: trunk/samba/docs/manpages/smbcontrol.1
===================================================================
--- trunk/samba/docs/manpages/smbcontrol.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/smbcontrol.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smbcontrol
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCONTROL" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBCONTROL" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -105,7 +114,7 @@
 .PP
 close\-share
 .RS 4
-Order smbd to close the client connections to the named share\&. Note that this doesn\'t affect client connections to any other shares\&. This message\-type takes an argument of the share name for which client connections will be closed, or the "*" character which will close all currently open shares\&. This may be useful if you made changes to the access controls on the share\&. This message can only be sent to
+Order smbd to close the client connections to the named share\&. Note that this doesn\*(Aqt affect client connections to any other shares\&. This message\-type takes an argument of the share name for which client connections will be closed, or the "*" character which will close all currently open shares\&. This may be useful if you made changes to the access controls on the share\&. This message can only be sent to
 \fBsmbd\fR\&.
 .RE
 .PP
@@ -170,7 +179,7 @@
 Send a job delete change notify message for the printer and unix jobid specified\&.
 .RE
 .sp
-Note that this message only sends notification that an event has occurred\&. It doesn\'t actually cause the event to happen\&.
+Note that this message only sends notification that an event has occurred\&. It doesn\*(Aqt actually cause the event to happen\&.
 .sp
 This message can only be sent to
 \fBsmbd\fR\&.

Modified: trunk/samba/docs/manpages/smbcquotas.1
===================================================================
--- trunk/samba/docs/manpages/smbcquotas.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/smbcquotas.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smbcquotas
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCQUOTAS" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBCQUOTAS" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -40,7 +49,7 @@
 .PP
 \-u user
 .RS 4
-Specifies the user of whom the quotas are get or set\&. By default the current user\'s username will be used\&.
+Specifies the user of whom the quotas are get or set\&. By default the current user\*(Aqs username will be used\&.
 .RE
 .PP
 \-L
@@ -65,7 +74,7 @@
 .PP
 \-t
 .RS 4
-Don\'t actually do anything, only validate the correctness of the arguments\&.
+Don\*(Aqt actually do anything, only validate the correctness of the arguments\&.
 .RE
 .PP
 \-v
@@ -198,7 +207,7 @@
 .PP
 If the operation succeeded, smbcquotas returns an exit status of 0\&. If
 smbcquotas
-couldn\'t connect to the specified server, or when there was an error getting or setting the quota(s), an exit status of 1 is returned\&. If there was an error parsing any command line arguments, an exit status of 2 is returned\&.
+couldn\*(Aqt connect to the specified server, or when there was an error getting or setting the quota(s), an exit status of 1 is returned\&. If there was an error parsing any command line arguments, an exit status of 2 is returned\&.
 .SH "VERSION"
 .PP
 This man page is correct for version 3 of the Samba suite\&.

Modified: trunk/samba/docs/manpages/smbd.8
===================================================================
--- trunk/samba/docs/manpages/smbd.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/smbd.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smbd
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBD" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "SMBD" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -65,7 +74,7 @@
 supervise
 and
 svscan
-from Daniel J\&. Bernstein\'s
+from Daniel J\&. Bernstein\*(Aqs
 daemontools
 package, or the AIX process monitor\&.
 .RE
@@ -221,7 +230,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fISession Management\fR: When not using share level security, users must pass PAM\'s session checks before access is granted\&. Note however, that this is bypassed in share level security\&. Note also that some older pam configuration files may need a line added for session support\&.
+\fISession Management\fR: When not using share level security, users must pass PAM\*(Aqs session checks before access is granted\&. Note however, that this is bypassed in share level security\&. Note also that some older pam configuration files may need a line added for session support\&.
 .RE
 .SH "VERSION"
 .PP
@@ -235,7 +244,7 @@
 Most messages are reasonably self\-explanatory\&. Unfortunately, at the time this man page was created, there are too many diagnostics available in the source code to warrant describing each and every diagnostic\&. At this stage your best bet is still to grep the source code and inspect the conditions that gave rise to the diagnostics you are seeing\&.
 .SH "TDB FILES"
 .PP
-Samba stores it\'s data in several TDB (Trivial Database) files, usually located in
+Samba stores it\*(Aqs data in several TDB (Trivial Database) files, usually located in
 /var/lib/samba\&.
 .PP
 (*) information persistent across restarts (but not necessarily important to backup)\&.
@@ -317,7 +326,7 @@
 .PP
 sessionid\&.tdb
 .RS 4
-session information (e\&.g\&. support for \'utmp = yes\')
+session information (e\&.g\&. support for \*(Aqutmp = yes\*(Aq)
 .RE
 .PP
 share_info\&.tdb*
@@ -327,17 +336,17 @@
 .PP
 winbindd_cache\&.tdb
 .RS 4
-winbindd\'s cache of user lists, etc\&.\&.\&.
+winbindd\*(Aqs cache of user lists, etc\&.\&.\&.
 .RE
 .PP
 winbindd_idmap\&.tdb*
 .RS 4
-winbindd\'s local idmap db
+winbindd\*(Aqs local idmap db
 .RE
 .PP
 wins\&.dat*
 .RS 4
-wins database when \'wins support = yes\'
+wins database when \*(Aqwins support = yes\*(Aq
 .RE
 .SH "SIGNALS"
 .PP
@@ -347,7 +356,7 @@
 smb\&.conf
 configuration file within a short period of time\&.
 .PP
-To shut down a user\'s
+To shut down a user\*(Aqs
 smbd
 process it is recommended that
 SIGKILL (\-9)
@@ -374,7 +383,7 @@
 \fBsmb.conf\fR(5),
 \fBsmbclient\fR(1),
 \fBtestparm\fR(1),
-\fBtestprns\fR(1), and the Internet RFC\'s
+\fBtestprns\fR(1), and the Internet RFC\*(Aqs
 rfc1001\&.txt,
 rfc1002\&.txt\&. In addition the CIFS (formerly SMB) specification is available as a link from the Web page
 http://samba\&.org/cifs/\&.

Modified: trunk/samba/docs/manpages/smbget.1
===================================================================
--- trunk/samba/docs/manpages/smbget.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/smbget.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smbget
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBGET" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBGET" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -67,7 +76,7 @@
 .PP
 \-n, \-\-nonprompt
 .RS 4
-Don\'t ask anything (non\-interactive)
+Don\*(Aqt ask anything (non\-interactive)
 .RE
 .PP
 \-d, \-\-debuglevel=INT
@@ -126,7 +135,7 @@
 .RE
 .SH "SMB URLS"
 .PP
-SMB URL\'s should be specified in the following format:
+SMB URL\*(Aqs should be specified in the following format:
 .PP
 .if n \{\
 .RS 4
@@ -163,7 +172,7 @@
 .RS 4
 .\}
 .nf
-# Recursively download \'src\' directory
+# Recursively download \*(Aqsrc\*(Aq directory
 smbget \-R smb://rhonwyn/jelmer/src
 # Download FreeBSD ISO and enable resuming
 smbget \-r smb://rhonwyn/isos/FreeBSD5\&.1\&.iso

Modified: trunk/samba/docs/manpages/smbgetrc.5
===================================================================
--- trunk/samba/docs/manpages/smbgetrc.5	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/smbgetrc.5	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smbgetrc
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBGETRC" "5" "01/18/2013" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMBGETRC" "5" "03/11/2013" "Samba 3\&.6" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/smbpasswd.5
===================================================================
--- trunk/samba/docs/manpages/smbpasswd.5	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/smbpasswd.5	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smbpasswd
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "5" "01/18/2013" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMBPASSWD" "5" "03/11/2013" "Samba 3\&.6" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -34,7 +43,7 @@
 .PP
 The format of the smbpasswd file used by Samba 2\&.2 is very similar to the familiar Unix
 passwd(5)
-file\&. It is an ASCII file containing one line for each user\&. Each field ithin each line is separated from the next by a colon\&. Any entry beginning with \'#\' is ignored\&. The smbpasswd file contains the following information for each user:
+file\&. It is an ASCII file containing one line for each user\&. Each field ithin each line is separated from the next by a colon\&. Any entry beginning with \*(Aq#\*(Aq is ignored\&. The smbpasswd file contains the following information for each user:
 .PP
 name
 .RS 4
@@ -48,7 +57,7 @@
 .PP
 Lanman Password Hash
 .RS 4
-This is the LANMAN hash of the user\'s password, encoded as 32 hex digits\&. The LANMAN hash is created by DES encrypting a well known string with the user\'s password as the DES key\&. This is the same password used by Windows 95/98 machines\&. Note that this password hash is regarded as weak as it is vulnerable to dictionary attacks and if two users choose the same password this entry will be identical (i\&.e\&. the password is not "salted" as the UNIX password is)\&. If the user has a null password this field will contain the characters "NO PASSWORD" as the start of the hex string\&. If the hex string is equal to 32 \'X\' characters then the user\'s account is marked as
+This is the LANMAN hash of the user\*(Aqs password, encoded as 32 hex digits\&. The LANMAN hash is created by DES encrypting a well known string with the user\*(Aqs password as the DES key\&. This is the same password used by Windows 95/98 machines\&. Note that this password hash is regarded as weak as it is vulnerable to dictionary attacks and if two users choose the same password this entry will be identical (i\&.e\&. the password is not "salted" as the UNIX password is)\&. If the user has a null password this field will contain the characters "NO PASSWORD" as the start of the hex string\&. If the hex string is equal to 32 \*(AqX\*(Aq characters then the user\*(Aqs account is marked as
 \fBdisabled\fR
 and the user will not be able to log onto the Samba server\&.
 .sp
@@ -62,7 +71,7 @@
 .PP
 NT Password Hash
 .RS 4
-This is the Windows NT hash of the user\'s password, encoded as 32 hex digits\&. The Windows NT hash is created by taking the user\'s password as represented in 16\-bit, little\-endian UNICODE and then applying the MD4 (internet rfc1321) hashing algorithm to it\&.
+This is the Windows NT hash of the user\*(Aqs password, encoded as 32 hex digits\&. The Windows NT hash is created by taking the user\*(Aqs password as represented in 16\-bit, little\-endian UNICODE and then applying the MD4 (internet rfc1321) hashing algorithm to it\&.
 .sp
 This password hash is considered more secure than the LANMAN Password Hash as it preserves the case of the password and uses a much higher quality hashing algorithm\&. However, it is still the case that if two users choose the same password this entry will be identical (i\&.e\&. the password is not "salted" as the UNIX password is)\&.
 .sp
@@ -75,7 +84,7 @@
 .PP
 Account Flags
 .RS 4
-This section contains flags that describe the attributes of the users account\&. This field is bracketed by \'[\' and \']\' characters and is always 13 characters in length (including the \'[\' and \']\' characters)\&. The contents of this field may be any of the following characters:
+This section contains flags that describe the attributes of the users account\&. This field is bracketed by \*(Aq[\*(Aq and \*(Aq]\*(Aq characters and is always 13 characters in length (including the \*(Aq[\*(Aq and \*(Aq]\*(Aq characters)\&. The contents of this field may be any of the following characters:
 .sp
 .RS 4
 .ie n \{\
@@ -149,7 +158,7 @@
 .PP
 Last Change Time
 .RS 4
-This field consists of the time the account was last modified\&. It consists of the characters \'LCT\-\' (standing for "Last Change Time") followed by a numeric encoding of the UNIX time in seconds since the epoch (1970) that the last change was made\&.
+This field consists of the time the account was last modified\&. It consists of the characters \*(AqLCT\-\*(Aq (standing for "Last Change Time") followed by a numeric encoding of the UNIX time in seconds since the epoch (1970) that the last change was made\&.
 .RE
 .PP
 All other colon separated fields are ignored at this time\&.

Modified: trunk/samba/docs/manpages/smbpasswd.8
===================================================================
--- trunk/samba/docs/manpages/smbpasswd.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/smbpasswd.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smbpasswd
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "SMBPASSWD" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -19,7 +28,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-smbpasswd \- change a user\'s SMB password
+smbpasswd \- change a user\*(Aqs SMB password
 .SH "SYNOPSIS"
 .HP \w'\ 'u
 smbpasswd [\-a] [\-c\ <config\ file>] [\-x] [\-d] [\-e] [\-D\ debuglevel] [\-n] [\-r\ <remote\ machine>] [\-R\ <name\ resolve\ order>] [\-m] [\-U\ username[%password]] [\-h] [\-s] [\-w\ pass] [\-W] [\-i] [\-L] [username]
@@ -33,7 +42,7 @@
 \fIroot\fR
 user or not\&. When run as a normal user it allows the user to change the password used for their SMB sessions on any machines that store SMB passwords\&.
 .PP
-By default (when run with no arguments) it will attempt to change the current user\'s SMB password on the local machine\&. This is similar to the way the
+By default (when run with no arguments) it will attempt to change the current user\*(Aqs SMB password on the local machine\&. This is similar to the way the
 passwd(1)
 program works\&.
 smbpasswd
@@ -82,12 +91,12 @@
 This option specifies that the username following should be
 \fBdisabled\fR
 in the local smbpasswd file\&. This is done by writing a
-\fB\'D\'\fR
+\fB\*(AqD\*(Aq\fR
 flag into the account control space in the smbpasswd file\&. Once this is done all attempts to authenticate via SMB using this username will fail\&.
 .sp
-If the smbpasswd file is in the \'old\' format (pre\-Samba 2\&.0 format) there is no space in the user\'s password entry to write this information and the command will FAIL\&. See
+If the smbpasswd file is in the \*(Aqold\*(Aq format (pre\-Samba 2\&.0 format) there is no space in the user\*(Aqs password entry to write this information and the command will FAIL\&. See
 \fBsmbpasswd\fR(5)
-for details on the \'old\' and new password file formats\&.
+for details on the \*(Aqold\*(Aq and new password file formats\&.
 .sp
 This option is only available when running smbpasswd as root\&.
 .RE
@@ -98,11 +107,11 @@
 \fBenabled\fR
 in the local smbpasswd file, if the account was previously disabled\&. If the account was not disabled this option has no effect\&. Once the account is enabled then the user will be able to authenticate via SMB once again\&.
 .sp
-If the smbpasswd file is in the \'old\' format, then
+If the smbpasswd file is in the \*(Aqold\*(Aq format, then
 smbpasswd
 will FAIL to enable the account\&. See
 \fBsmbpasswd\fR(5)
-for details on the \'old\' and new password file formats\&.
+for details on the \*(Aqold\*(Aq and new password file formats\&.
 .sp
 This option is only available when running smbpasswd as root\&.
 .RE
@@ -251,7 +260,7 @@
 switch is used to specify the password to be used with the
 \m[blue]\fBldap admin dn\fR\m[]\&. Note that the password is stored in the
 secrets\&.tdb
-and is keyed off of the admin\'s DN\&. This means that if the value of
+and is keyed off of the admin\*(Aqs DN\&. This means that if the value of
 \fIldap admin dn\fR
 ever changes, the password will need to be manually updated as well\&.
 .RE
@@ -266,7 +275,7 @@
 switch is used to specify the password to be used with the
 \m[blue]\fBldap admin dn\fR\m[]\&. Note that the password is stored in the
 secrets\&.tdb
-and is keyed off of the admin\'s DN\&. This means that if the value of
+and is keyed off of the admin\*(Aqs DN\&. This means that if the value of
 \fIldap admin dn\fR
 ever changes, the password will need to be manually updated as well\&.
 .RE

Modified: trunk/samba/docs/manpages/smbspool.8
===================================================================
--- trunk/samba/docs/manpages/smbspool.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/smbspool.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smbspool
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBSPOOL" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "SMBSPOOL" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -114,7 +123,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-The user argument (argv[2]) contains the print user\'s name and is presently not used by smbspool\&.
+The user argument (argv[2]) contains the print user\*(Aqs name and is presently not used by smbspool\&.
 .RE
 .sp
 .RS 4

Modified: trunk/samba/docs/manpages/smbstatus.1
===================================================================
--- trunk/samba/docs/manpages/smbstatus.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/smbstatus.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smbstatus
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBSTATUS" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBSTATUS" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/smbta-util.8
===================================================================
--- trunk/samba/docs/manpages/smbta-util.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/smbta-util.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smbta-util
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBTA\-UTIL" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "SMBTA\-UTIL" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/smbtar.1
===================================================================
--- trunk/samba/docs/manpages/smbtar.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/smbtar.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smbtar
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBTAR" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBTAR" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -123,7 +132,7 @@
 .PP
 The
 smbtar
-script has different options from ordinary tar and from smbclient\'s tar command\&.
+script has different options from ordinary tar and from smbclient\*(Aqs tar command\&.
 .SH "CAVEATS"
 .PP
 Sites that are more careful about security may not like the way the script handles PC passwords\&. Backup and restore work on entire shares; should work on file lists\&. smbtar works best with GNU tar and may not work well with other versions\&.

Modified: trunk/samba/docs/manpages/smbtree.1
===================================================================
--- trunk/samba/docs/manpages/smbtree.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/smbtree.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smbtree
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBTREE" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBTREE" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/swat.8
===================================================================
--- trunk/samba/docs/manpages/swat.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/swat.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: swat
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SWAT" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "SWAT" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -174,7 +183,7 @@
 /etc/services
 file\&.
 .PP
-the choice of port number isn\'t really important except that it should be less than 1024 and not currently used (using a number above 1024 presents an obscure security hole depending on the implementation details of your
+the choice of port number isn\*(Aqt really important except that it should be less than 1024 and not currently used (using a number above 1024 presents an obscure security hole depending on the implementation details of your
 inetd
 daemon)\&.
 .PP
@@ -228,7 +237,7 @@
 \fIcopy= \fR
 options\&. If you have a carefully crafted
 smb\&.conf
-then back it up or don\'t use swat!
+then back it up or don\*(Aqt use swat!
 .SH "VERSION"
 .PP
 This man page is correct for version 3 of the Samba suite\&.

Modified: trunk/samba/docs/manpages/tdbbackup.8
===================================================================
--- trunk/samba/docs/manpages/tdbbackup.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/tdbbackup.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: tdbbackup
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBBACKUP" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "TDBBACKUP" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/tdbdump.8
===================================================================
--- trunk/samba/docs/manpages/tdbdump.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/tdbdump.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: tdbdump
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBDUMP" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "TDBDUMP" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -30,7 +39,7 @@
 suite\&.
 .PP
 tdbdump
-is a very simple utility that \'dumps\' the contents of a TDB (Trivial DataBase) file to standard output in a human\-readable format\&.
+is a very simple utility that \*(Aqdumps\*(Aq the contents of a TDB (Trivial DataBase) file to standard output in a human\-readable format\&.
 .PP
 This tool can be used when debugging problems with TDB files\&. It is intended for those who are somewhat familiar with Samba internals\&.
 .SH "VERSION"

Modified: trunk/samba/docs/manpages/tdbtool.8
===================================================================
--- trunk/samba/docs/manpages/tdbtool.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/tdbtool.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: tdbtool
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBTOOL" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "TDBTOOL" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/testparm.1
===================================================================
--- trunk/samba/docs/manpages/testparm.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/testparm.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: testparm
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TESTPARM" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "TESTPARM" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_acl_tdb.8
===================================================================
--- trunk/samba/docs/manpages/vfs_acl_tdb.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_acl_tdb.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_acl_tdb
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_ACL_TDB" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_ACL_TDB" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_acl_xattr.8
===================================================================
--- trunk/samba/docs/manpages/vfs_acl_xattr.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_acl_xattr.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_acl_xattr
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_ACL_XATTR" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_ACL_XATTR" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_aio_fork.8
===================================================================
--- trunk/samba/docs/manpages/vfs_aio_fork.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_aio_fork.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_aio_fork
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_AIO_FORK" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AIO_FORK" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_aio_pthread.8
===================================================================
--- trunk/samba/docs/manpages/vfs_aio_pthread.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_aio_pthread.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_aio_pthread
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_AIO_PTHREAD" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AIO_PTHREAD" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_audit.8
===================================================================
--- trunk/samba/docs/manpages/vfs_audit.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_audit.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_audit
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_AUDIT" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AUDIT" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_cacheprime.8
===================================================================
--- trunk/samba/docs/manpages/vfs_cacheprime.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_cacheprime.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_cacheprime
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CACHEPRIME" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CACHEPRIME" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_cap.8
===================================================================
--- trunk/samba/docs/manpages/vfs_cap.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_cap.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_cap
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CAP" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CAP" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_catia.8
===================================================================
--- trunk/samba/docs/manpages/vfs_catia.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_catia.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_catia
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CATIA" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CATIA" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -31,11 +40,17 @@
 .PP
 The Catia CAD package commonly creates filenames that use characters that are illegal in CIFS filenames\&. The
 vfs_catia
-VFS module implements a fixed character mapping so that these files can be shared with CIFS clients\&.
+VFS module implements a character mapping so that these files can be shared with CIFS clients\&.
 .PP
 This module is stackable\&.
+.PP
+Up to samba version 3\&.4\&.x a fixed character mapping was used\&. The invalid windows characters \e / : * ? " < > | and the blank character were mapped in a hardcoded way\&.
+.PP
+Starting with samba\-3\&.5\&.0 a more flexible mapping was introduced\&. The new parameter "catia:mappings" now specifies the mapping on a char by char basis using the notation: unix hex char 0x\&.\&. : windows hex char 0x\&.\&. Multiple character mappings are separated by a comma\&.
 .SH "EXAMPLES"
 .PP
+Samba versions up to 3\&.4\&.x:
+.PP
 Map Catia filenames on the [CAD] share:
 .sp
 .if n \{\
@@ -49,9 +64,74 @@
 .if n \{\
 .RE
 .\}
+.PP
+Samba versions 3\&.5\&.0 and later:
+.PP
+Map Catia filenames on the [CAD] share:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+        \fI[CAD]\fR
+	\m[blue]\fBpath = /data/cad\fR\m[]
+	\m[blue]\fBvfs objects = catia\fR\m[]
+	\m[blue]\fBcatia:mappings = 0x22:0xa8\fR\m[]
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+To get the full formerly fixed mappings:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+        \fI[CAD]\fR
+	\m[blue]\fBpath = /data/cad\fR\m[]
+	\m[blue]\fBvfs objects = catia\fR\m[]
+	\m[blue]\fBcatia:mappings = 0x22:0xa8,0x2a:0xa4,0x2f:0xf8,0x3a:0xf7,0x3c:0xab,0x3e:0xbb,0x3f:0xbf,0x5c:0xff,0x7c:0xa6,0x20:0xb1\fR\m[]
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+Unix filename to be translated (Note that the path delimiter "/" is not used here):
+.PP
+a\ea:a*a?a"a<a>a|a a
+.PP
+Resulting windows filename:
+.PP
+aÿa\(dia\(Csa\(r?a\(ada\(Foa\(Fca\(bba\(+-a
+.PP
+Note that the character mapping must work in BOTH directions (unix \-> windows and windows \-> unix) to get unique and existing file names!
+.PP
+A NOT working example:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+        \fI[CAD]\fR
+	\m[blue]\fBpath = /data/cad\fR\m[]
+	\m[blue]\fBvfs objects = catia\fR\m[]
+	\m[blue]\fBcatia:mappings = 0x3a:0x5f\fR\m[]
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+Here the colon ":" is mapped to the underscore "_"\&.
+.PP
+Assuming a unix filename "a:should_work", which is well translated to windows as "a_should_work"\&.
+.PP
+BUT the reverse mapping from windows "a_should_work" to unix will result in "a:should:work" \- something like "file not found" will be returned\&.
 .SH "VERSION"
 .PP
-This man page is correct for version 3\&.0\&.25 of the Samba suite\&.
+This man page is correct for all versions up to 4\&.0\&.3 of the Samba suite\&.
 .SH "AUTHOR"
 .PP
 The original Samba software and related utilities 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\&.
+.PP
+New version written by Guenter Kukkukk kukks at samba\&.org

Modified: trunk/samba/docs/manpages/vfs_commit.8
===================================================================
--- trunk/samba/docs/manpages/vfs_commit.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_commit.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_commit
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_COMMIT" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_COMMIT" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_crossrename.8
===================================================================
--- trunk/samba/docs/manpages/vfs_crossrename.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_crossrename.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_crossrename
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CROSSRENAME" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CROSSRENAME" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_default_quota.8
===================================================================
--- trunk/samba/docs/manpages/vfs_default_quota.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_default_quota.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_default_quota
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_DEFAULT_QUOTA" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_DEFAULT_QUOTA" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_dirsort.8
===================================================================
--- trunk/samba/docs/manpages/vfs_dirsort.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_dirsort.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_dirsort
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_DIRSORT" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_DIRSORT" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_extd_audit.8
===================================================================
--- trunk/samba/docs/manpages/vfs_extd_audit.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_extd_audit.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_extd_audit
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_EXTD_AUDIT" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_EXTD_AUDIT" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_fake_perms.8
===================================================================
--- trunk/samba/docs/manpages/vfs_fake_perms.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_fake_perms.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_fake_perms
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_FAKE_PERMS" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FAKE_PERMS" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_fileid.8
===================================================================
--- trunk/samba/docs/manpages/vfs_fileid.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_fileid.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_fileid
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_FILEID" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FILEID" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_full_audit.8
===================================================================
--- trunk/samba/docs/manpages/vfs_full_audit.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_full_audit.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_full_audit
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_FULL_AUDIT" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FULL_AUDIT" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -324,7 +333,7 @@
 recognizes the special operation names "all" and "none ", which refer to all the VFS operations and none of the VFS operations respectively\&.
 .PP
 vfs_full_audit
-records operations in fixed format consisting of fields separated by \'|\' characters\&. The format is:
+records operations in fixed format consisting of fields separated by \*(Aq|\*(Aq characters\&. The format is:
 .sp
 .if n \{\
 .RS 4

Modified: trunk/samba/docs/manpages/vfs_gpfs.8
===================================================================
--- trunk/samba/docs/manpages/vfs_gpfs.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_gpfs.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_gpfs
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_GPFS" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_GPFS" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -211,7 +220,7 @@
 \- do not use
 gpfs_get_realfilename_path()\&. It seems that
 gpfs_get_realfilename_path()
-doesn\'t work on AIX\&.
+doesn\*(Aqt work on AIX\&.
 .RE
 .sp
 .RE
@@ -219,7 +228,7 @@
 .PP
 gpfs:winattr = [ yes | no ]
 .RS 4
-Enable/Disable usage of the windows attributes in GPFS\&. GPFS is able to store windows file attributes e\&.g\&. HIDDEN, READONLY, SYSTEM and others natively\&. That means Samba doesn\'t need to map them to permission bits or extended attributes\&.
+Enable/Disable usage of the windows attributes in GPFS\&. GPFS is able to store windows file attributes e\&.g\&. HIDDEN, READONLY, SYSTEM and others natively\&. That means Samba doesn\*(Aqt need to map them to permission bits or extended attributes\&.
 .sp
 .RS 4
 .ie n \{\
@@ -252,7 +261,7 @@
 .PP
 gpfs:merge_writeappend = [ yes | no ]
 .RS 4
-GPFS ACLs doesn\'t know about the \'APPEND\' right\&. This optionen lets Samba map the \'APPEND\' right to \'WRITE\'\&.
+GPFS ACLs doesn\*(Aqt know about the \*(AqAPPEND\*(Aq right\&. This optionen lets Samba map the \*(AqAPPEND\*(Aq right to \*(AqWRITE\*(Aq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -264,7 +273,7 @@
 .\}
 
 yes(default)
-\- map \'APPEND\' to \'WRITE\'\&.
+\- map \*(AqAPPEND\*(Aq to \*(AqWRITE\*(Aq\&.
 .RE
 .sp
 .RS 4
@@ -277,7 +286,7 @@
 .\}
 
 no
-\- do not map \'APPEND\' to \'WRITE\'\&.
+\- do not map \*(AqAPPEND\*(Aq to \*(AqWRITE\*(Aq\&.
 .RE
 .sp
 .RE
@@ -285,7 +294,7 @@
 .PP
 gpfs:refuse_dacl_protected = [ yes | no ]
 .RS 4
-As GPFS does not support the ACE4_FLAG_NO_PROPAGATE NFSv4 flag (which would be the mapping for the DESC_DACL_PROTECTED flag), the status of this flag is currently silently ignored by Samba\&. That means that if you deselect the "Allow inheritable permissions\&.\&.\&." checkbox in Windows\' ACL dialog and then apply the ACL, the flag will be back immediately\&.
+As GPFS does not support the ACE4_FLAG_NO_PROPAGATE NFSv4 flag (which would be the mapping for the DESC_DACL_PROTECTED flag), the status of this flag is currently silently ignored by Samba\&. That means that if you deselect the "Allow inheritable permissions\&.\&.\&." checkbox in Windows\*(Aq ACL dialog and then apply the ACL, the flag will be back immediately\&.
 .sp
 To make sure that automatic migration with e\&.g\&. robocopy does not lead to ACLs silently (and unintentionally) changed, you can set
 gpfs:refuse_dacl_protected = yes
@@ -392,7 +401,7 @@
 .IP \(bu 2.3
 .\}
 ignore
-\- don\'t include the second matching ACE
+\- don\*(Aqt include the second matching ACE
 .RE
 .sp
 .RS 4

Modified: trunk/samba/docs/manpages/vfs_netatalk.8
===================================================================
--- trunk/samba/docs/manpages/vfs_netatalk.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_netatalk.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_netatalk
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_NETATALK" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_NETATALK" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_notify_fam.8
===================================================================
--- trunk/samba/docs/manpages/vfs_notify_fam.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_notify_fam.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_notify_fam
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_NOTIFY_FAM" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_NOTIFY_FAM" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_prealloc.8
===================================================================
--- trunk/samba/docs/manpages/vfs_prealloc.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_prealloc.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_prealloc
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_PREALLOC" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_PREALLOC" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_preopen.8
===================================================================
--- trunk/samba/docs/manpages/vfs_preopen.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_preopen.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_preopen
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_PREOPEN" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_PREOPEN" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -31,7 +40,7 @@
 .PP
 This module assists applications that want to read numbered files in sequence with very strict latency requirements\&. One area where this happens in video streaming applications that want to read one file per frame\&.
 .PP
-When you use this module, a number of helper processes is started that speculatively open files and read a number of bytes to prime the file system cache, so that later on when the real application\'s request comes along, no disk access is necessary\&.
+When you use this module, a number of helper processes is started that speculatively open files and read a number of bytes to prime the file system cache, so that later on when the real application\*(Aqs request comes along, no disk access is necessary\&.
 .PP
 This module is stackable\&.
 .SH "OPTIONS"

Modified: trunk/samba/docs/manpages/vfs_readahead.8
===================================================================
--- trunk/samba/docs/manpages/vfs_readahead.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_readahead.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_readahead
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_READAHEAD" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_READAHEAD" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_readonly.8
===================================================================
--- trunk/samba/docs/manpages/vfs_readonly.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_readonly.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_readonly
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_READONLY" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_READONLY" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_recycle.8
===================================================================
--- trunk/samba/docs/manpages/vfs_recycle.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_recycle.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_recycle
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_RECYCLE" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_RECYCLE" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -71,12 +80,12 @@
 .PP
 recycle:touch = BOOL
 .RS 4
-Specifies whether a file\'s access date should be updated when the file is moved to the repository\&.
+Specifies whether a file\*(Aqs access date should be updated when the file is moved to the repository\&.
 .RE
 .PP
 recycle:touch_mtime = BOOL
 .RS 4
-Specifies whether a file\'s last modified date should be updated when the file is moved to the repository\&.
+Specifies whether a file\*(Aqs last modified date should be updated when the file is moved to the repository\&.
 .RE
 .PP
 recycle:minsize = BYTES

Modified: trunk/samba/docs/manpages/vfs_scannedonly.8
===================================================================
--- trunk/samba/docs/manpages/vfs_scannedonly.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_scannedonly.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_scannedonly
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_SCANNEDONLY" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SCANNEDONLY" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -38,7 +47,7 @@
 \&.scanned:
 file exists, and is newer than the pertinent file\&. If this is the case, the file is shown to the user\&. If this is not the case, the file is not returned in a directory listing (configurable), and cannot be opened (configurable)\&. The Samba vfs module will notify the daemon to scan this file\&.
 .PP
-So what happens for the user in the default configuration\&. The first time a directory is listed, it shows files as \'file is being scanned for viruses, but after the first time all files are shown\&. There is a utility scannedonly_prescan that can help you to prescan all directories\&. When new files are written the daemon is notified immediately after the file is complete\&.
+So what happens for the user in the default configuration\&. The first time a directory is listed, it shows files as \*(Aqfile is being scanned for viruses, but after the first time all files are shown\&. There is a utility scannedonly_prescan that can help you to prescan all directories\&. When new files are written the daemon is notified immediately after the file is complete\&.
 .PP
 If a virus is found by the daemon, a file with a warning message is created in the directory of the user, a warning is sent to the logs, and the file is renamed to have prefix
 \&.virus:\&. Files with the
@@ -74,7 +83,7 @@
 .PP
 scannedonly:show_special_files = True
 .RS 4
-Whether sockets, devices and fifo\'s (all not scanned for viruses) should be visible to the user
+Whether sockets, devices and fifo\*(Aqs (all not scanned for viruses) should be visible to the user
 .RE
 .PP
 scannedonly:rm_hidden_files_on_rmdir = True

Modified: trunk/samba/docs/manpages/vfs_shadow_copy.8
===================================================================
--- trunk/samba/docs/manpages/vfs_shadow_copy.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_shadow_copy.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_shadow_copy
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SHADOW_COPY" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_shadow_copy2.8
===================================================================
--- trunk/samba/docs/manpages/vfs_shadow_copy2.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_shadow_copy2.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_shadow_copy2
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY2" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SHADOW_COPY2" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -43,7 +52,7 @@
 .sp -1
 .IP "  1." 4.2
 .\}
-You don\'t need to populate your shares with symlinks to the snapshots\&. This can be very important when you have thousands of shares, or use [homes]\&.
+You don\*(Aqt need to populate your shares with symlinks to the snapshots\&. This can be very important when you have thousands of shares, or use [homes]\&.
 .RE
 .sp
 .RS 4
@@ -54,7 +63,7 @@
 .sp -1
 .IP "  2." 4.2
 .\}
-The inode number of the files is altered so it is different from the original\&. This allows the \'restore\' button to work without a sharing violation\&.
+The inode number of the files is altered so it is different from the original\&. This allows the \*(Aqrestore\*(Aq button to work without a sharing violation\&.
 .RE
 .sp
 .RE
@@ -191,7 +200,7 @@
 .RS 4
 If you enable
 shadow:fixinodes
-then this module will modify the apparent inode number of files in the snapshot directories using a hash of the files path\&. This is needed for snapshot systems where the snapshots have the same device:inode number as the original files (such as happens with GPFS snapshots)\&. If you don\'t set this option then the \'restore\' button in the shadow copy UI will fail with a sharing violation\&.
+then this module will modify the apparent inode number of files in the snapshot directories using a hash of the files path\&. This is needed for snapshot systems where the snapshots have the same device:inode number as the original files (such as happens with GPFS snapshots)\&. If you don\*(Aqt set this option then the \*(Aqrestore\*(Aq button in the shadow copy UI will fail with a sharing violation\&.
 .RE
 .SH "EXAMPLES"
 .PP

Modified: trunk/samba/docs/manpages/vfs_smb_traffic_analyzer.8
===================================================================
--- trunk/samba/docs/manpages/vfs_smb_traffic_analyzer.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_smb_traffic_analyzer.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: smb_traffic_analyzer
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMB_TRAFFIC_ANALYZER" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "SMB_TRAFFIC_ANALYZER" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -31,7 +40,7 @@
 .PP
 The
 vfs_smb_traffic_analyzer
-VFS module logs client file operations on a Samba server and sends this data over a socket to a helper program (in the following the "Receiver"), which feeds a SQL database\&. More information on the helper programs can be obtained from the homepage of the project at: http://holger123\&.wordpress\&.com/smb\-traffic\-analyzer/ Since the VFS module depends on a receiver that is doing something with the data, it is evolving in it\'s development\&. Therefore, the module works with different protocol versions, and the receiver has to be able to decode the protocol that is used\&. The protocol version 1 was introduced to Samba at September 25, 2008\&. It was a very simple protocol, supporting only a small list of VFS operations, and had several drawbacks\&. The protocol version 2 is a try to solve the problems version 1 had while at the same time adding new features\&. With the release of Samba 3\&.6\&.0, the module will run protocol version 2 by default\&.
+VFS module logs client file operations on a Samba server and sends this data over a socket to a helper program (in the following the "Receiver"), which feeds a SQL database\&. More information on the helper programs can be obtained from the homepage of the project at: http://holger123\&.wordpress\&.com/smb\-traffic\-analyzer/ Since the VFS module depends on a receiver that is doing something with the data, it is evolving in it\*(Aqs development\&. Therefore, the module works with different protocol versions, and the receiver has to be able to decode the protocol that is used\&. The protocol version 1 was introduced to Samba at September 25, 2008\&. It was a very simple protocol, supporting only a small list of VFS operations, and had several drawbacks\&. The protocol version 2 is a try to solve the problems version 1 had while at the same time adding new features\&. With the release of Samba 3\&.6\&.0, the module will run protocol version 2 by default\&.
 .SH "PROTOCOL VERSION 1 DOCUMENTATION"
 .PP
 vfs_smb_traffic_analyzer
@@ -191,7 +200,7 @@
 .\}
 
 Insecure network transfer \-
-Protocol version 1 sends all it\'s data as plaintext over the network\&.
+Protocol version 1 sends all it\*(Aqs data as plaintext over the network\&.
 .RE
 .sp
 .RS 4
@@ -217,7 +226,7 @@
 .\}
 
 No subreleases of the protocol \-
-Protocol version 1 is fixed on it\'s version, making it unable to introduce new features or bugfixes through compatible sub\-releases\&.
+Protocol version 1 is fixed on it\*(Aqs version, making it unable to introduce new features or bugfixes through compatible sub\-releases\&.
 .RE
 .SH "VERSION 2 OF THE PROTOCOL"
 .PP
@@ -294,7 +303,7 @@
 .PP
 smb_traffic_analyzer:total_anonymization = STRING
 .RS 4
-If STRING matches to \'yes\', the module will replace any user name with the string given by the option smb_traffic_analyzer:anonymize_prefix, without generating an additional hash number\&. This means that any transfer data will be mapped to a single user, leading to a total anonymization of user related data\&. In version 2\&.x of the protocol, the users SID will also be anonymized\&.
+If STRING matches to \*(Aqyes\*(Aq, the module will replace any user name with the string given by the option smb_traffic_analyzer:anonymize_prefix, without generating an additional hash number\&. This means that any transfer data will be mapped to a single user, leading to a total anonymization of user related data\&. In version 2\&.x of the protocol, the users SID will also be anonymized\&.
 .RE
 .PP
 smb_traffic_analyzer:protocol_version = STRING

Modified: trunk/samba/docs/manpages/vfs_streams_depot.8
===================================================================
--- trunk/samba/docs/manpages/vfs_streams_depot.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_streams_depot.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_streams_depot
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_DEPOT" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_STREAMS_DEPOT" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_streams_xattr.8
===================================================================
--- trunk/samba/docs/manpages/vfs_streams_xattr.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_streams_xattr.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_streams_xattr
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_XATTR" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_STREAMS_XATTR" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfs_time_audit.8
===================================================================
--- trunk/samba/docs/manpages/vfs_time_audit.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_time_audit.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_time_audit
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_TIME_AUDIT" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_TIME_AUDIT" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -34,7 +43,7 @@
 VFS module logs system calls that take longer than the number of milliseconds defined by the variable
 time_audit:audit_timeout\&. It will log the calls and the time spent in it\&.
 .PP
-It\'s kind of comparable with
+It\*(Aqs kind of comparable with
 strace \-T
 and is helpful to reveal performance problems with the underlying file and storage subsystems\&.
 .PP

Modified: trunk/samba/docs/manpages/vfs_xattr_tdb.8
===================================================================
--- trunk/samba/docs/manpages/vfs_xattr_tdb.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfs_xattr_tdb.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfs_xattr_tdb
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_XATTR_TDB" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_XATTR_TDB" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/vfstest.1
===================================================================
--- trunk/samba/docs/manpages/vfstest.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/vfstest.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: vfstest
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFSTEST" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "VFSTEST" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -46,7 +55,7 @@
 \-l|\-\-logfile=logbasename
 .RS 4
 File name for log/debug files\&. The extension
-\fB\'\&.client\'\fR
+\fB\*(Aq\&.client\*(Aq\fR
 will be appended\&. The log file is never removed by the client\&.
 .RE
 .PP

Modified: trunk/samba/docs/manpages/wbinfo.1
===================================================================
--- trunk/samba/docs/manpages/wbinfo.1	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/wbinfo.1	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: wbinfo
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "WBINFO" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
+.TH "WBINFO" "1" "03/11/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -98,7 +107,7 @@
 .PP
 \-\-domain \fIname\fR
 .RS 4
-This parameter sets the domain on which any specified operations will performed\&. If special domain name \'\&.\' is used to represent the current domain to which
+This parameter sets the domain on which any specified operations will performed\&. If special domain name \*(Aq\&.\*(Aq is used to represent the current domain to which
 \fBwinbindd\fR(8)
 belongs\&. Currently only the
 \fB\-u\fR, and
@@ -232,7 +241,7 @@
 .RS 4
 Check whether
 \fBwinbindd\fR(8)
-is still alive\&. Prints out either \'succeeded\' or \'failed\'\&.
+is still alive\&. Prints out either \*(Aqsucceeded\*(Aq or \*(Aqfailed\*(Aq\&.
 .RE
 .PP
 \-P|\-\-ping\-dc

Modified: trunk/samba/docs/manpages/winbind_krb5_locator.7
===================================================================
--- trunk/samba/docs/manpages/winbind_krb5_locator.7	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/winbind_krb5_locator.7	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: winbind_krb5_locator
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: 7
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "WINBIND_KRB5_LOCATOR" "7" "01/18/2013" "Samba 3\&.6" "7"
+.TH "WINBIND_KRB5_LOCATOR" "7" "03/11/2013" "Samba 3\&.6" "7"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation

Modified: trunk/samba/docs/manpages/winbindd.8
===================================================================
--- trunk/samba/docs/manpages/winbindd.8	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs/manpages/winbindd.8	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: winbindd
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/11/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "WINBINDD" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "WINBINDD" "8" "03/11/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -41,7 +50,7 @@
 pam_winbind\&.so
 PAM module, by managing connections to domain controllers\&. In this configuration the
 \m[blue]\fBidmap config * : range\fR\m[]
-parameter is not required\&. (This is known as `netlogon proxy only mode\'\&.)
+parameter is not required\&. (This is known as `netlogon proxy only mode\*(Aq\&.)
 .PP
 The Name Service Switch allows user and system information to be obtained from different databases services such as NIS or DNS\&. The exact behaviour can be configured through the
 /etc/nsswitch\&.conf
@@ -49,7 +58,7 @@
 .PP
 The service provided by
 winbindd
-is called `winbind\' and can be used to resolve user and group information from a Windows NT server\&. The service can also provide authentication services via an associated PAM module\&.
+is called `winbind\*(Aq and can be used to resolve user and group information from a Windows NT server\&. The service can also provide authentication services via an associated PAM module\&.
 .PP
 The
 pam_winbind
@@ -151,7 +160,7 @@
 supervise
 and
 svscan
-from Daniel J\&. Bernstein\'s
+from Daniel J\&. Bernstein\*(Aqs
 daemontools
 package, or the AIX process monitor\&.
 .RE
@@ -218,7 +227,7 @@
 .PP
 \-n
 .RS 4
-Disable caching\&. This means winbindd will always have to wait for a response from the domain controller before it can respond to a client and this thus makes things slower\&. The results will however be more accurate, since results from the cache might not be up\-to\-date\&. This might also temporarily hang winbindd if the DC doesn\'t respond\&.
+Disable caching\&. This means winbindd will always have to wait for a response from the domain controller before it can respond to a client and this thus makes things slower\&. The results will however be more accurate, since results from the cache might not be up\-to\-date\&. This might also temporarily hang winbindd if the DC doesn\*(Aqt respond\&.
 .RE
 .SH "NAME AND ID RESOLUTION"
 .PP
@@ -532,11 +541,11 @@
 .PP
 $LOCKDIR/winbindd_privileged/pipe
 .RS 4
-The UNIX pipe over which \'privileged\' clients communicate with the
+The UNIX pipe over which \*(Aqprivileged\*(Aq clients communicate with the
 winbindd
 program\&. For security reasons, access to some winbindd functions \- like those needed by the
 ntlm_auth
-utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on $LOCKDIR/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
+utility \- is restricted\&. By default, only users in the \*(Aqroot\*(Aq group will get this access, however the administrator may change the group permissions on $LOCKDIR/winbindd_privileged to allow programs like \*(Aqsquid\*(Aq to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
 $LOCKDIR/winbindd_privileged
 directory and
 $LOCKDIR/winbindd_privileged/pipe

Copied: trunk/samba/docs-xml/manpages-3/dbwrap_tool.1.xml (from rev 4205, tags/samba/upstream_3.6.13/docs-xml/manpages-3/dbwrap_tool.1.xml)
===================================================================
--- trunk/samba/docs-xml/manpages-3/dbwrap_tool.1.xml	                        (rev 0)
+++ trunk/samba/docs-xml/manpages-3/dbwrap_tool.1.xml	2013-03-18 18:43:43 UTC (rev 4206)
@@ -0,0 +1,148 @@
+<?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="dbwrap_tool.1">
+
+<refmeta>
+	<refentrytitle>dbwrap_tool</refentrytitle>
+	<manvolnum>1</manvolnum>
+	<refmiscinfo class="source">Samba</refmiscinfo>
+	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
+	<refmiscinfo class="version">3.6</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+	<refname>dbwrap_tool</refname>
+	<refpurpose>low level TDB/CTDB manipulation tool using the dbwrap interface</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>dbwrap_tool</command>
+		<arg choice="req"><database></arg>
+		<arg choice="req"><operation></arg>
+		<arg choice="opt"><key>
+			<arg choice="opt"><type>
+				<arg choice="opt"><value></arg>
+			</arg>
+		</arg>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+	<manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+	<para>The dbwrap_tool program is used to read and manipulate
+	TDB/CTDB databases using the dbwrap interface.</para>
+
+	<para>The following database operations are available:
+	<itemizedlist>
+		<listitem><para>fetch: fetch a record</para></listitem>
+		<listitem><para>store: create or modify a record</para></listitem>
+		<listitem><para>delete: remove a record</para></listitem>
+		<listitem><para>erase: remove all records</para></listitem>
+		<listitem><para>listkeys: list all available records</para></listitem>
+	</itemizedlist>
+	</para>
+	<para>The following types are available:
+	<itemizedlist>
+		<listitem><para>int32: signed 32bit integer</para></listitem>
+		<listitem><para>uint32: unsigned 32bit integer</para></listitem>
+		<listitem><para>string: "hello world"</para></listitem>
+	</itemizedlist>
+	</para>
+</refsect1>
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<para>None.</para>
+</refsect1>
+
+<refsect1>
+	<title>COMMANDS</title>
+	<refsect2>
+		<title>fetch</title>
+		<cmdsynopsis>
+			<command>dbwrap_tool</command> <database> fetch <key> <type>
+		</cmdsynopsis>
+	</refsect2>
+	<refsect2>
+		<title>store</title>
+		<cmdsynopsis>
+			<command>dbwrap_tool</command> <database> store <key> <type> <value>
+		</cmdsynopsis>
+	</refsect2>
+	<refsect2>
+		<title>delete</title>
+		<cmdsynopsis>
+			<command>dbwrap_tool</command> <database> delete <key>
+		</cmdsynopsis>
+	</refsect2>
+	<refsect2>
+		<title>erase</title>
+		<cmdsynopsis>
+			<command>dbwrap_tool</command> <database> erase
+		</cmdsynopsis>
+	</refsect2>
+	<refsect2>
+		<title>listkeys</title>
+		<cmdsynopsis>
+			<command>dbwrap_tool</command> <database> listkeys
+		</cmdsynopsis>
+	</refsect2>
+</refsect1>
+
+<refsect1>
+	<title>EXAMPLES</title>
+	<variablelist>
+		<varlistentry><term>List all keys from winbindd_idmap.tdb</term>
+			<listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb listkeys</para></listitem>
+		</varlistentry>
+		<varlistentry><term>Fetch record with key "USER HWM" as uint32</term>
+			<listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb fetch "USER HWM" uint32</para></listitem>
+		</varlistentry>
+		<varlistentry><term>Remove record with key "USER HWM"</term>
+			<listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb remove "USER HWM"</para></listitem>
+		</varlistentry>
+		<varlistentry><term>Store and overwrite record "USER HWM" with value 214</term>
+			<listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb store "USER HWM" uint32 214</para></listitem>
+		</varlistentry>
+	</variablelist>
+</refsect1>
+
+<refsect1>
+	<title>NOTES</title>
+
+	<para>Use with caution!</para>
+</refsect1>
+
+
+<refsect1>
+	<title>VERSION</title>
+
+	<para>This man page is correct for version 3 of the Samba suite.</para>
+</refsect1>
+
+<refsect1>
+	<title>SEE ALSO</title>
+	<para><citerefentry><refentrytitle>smbd</refentrytitle>
+	<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba</refentrytitle>
+	<manvolnum>7</manvolnum></citerefentry></para>
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+
+	<para>The original Samba software and related utilities
+	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>
+
+	<para>The dbwrap_tool manpage was written by Bjoern Baumbach.</para>
+</refsect1>
+
+</refentry>

Modified: trunk/samba/docs-xml/manpages-3/vfs_catia.8.xml
===================================================================
--- trunk/samba/docs-xml/manpages-3/vfs_catia.8.xml	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/docs-xml/manpages-3/vfs_catia.8.xml	2013-03-18 18:43:43 UTC (rev 4206)
@@ -31,18 +31,31 @@
 
 	<para>The Catia CAD package commonly creates filenames that
 	use characters that are illegal in CIFS filenames. The
-	<command>vfs_catia</command> VFS module implements a fixed character
+	<command>vfs_catia</command> VFS module implements a character
 	mapping so that these files can be shared with CIFS clients.
 	</para>
 
 	<para>This module is stackable.</para>
 
+	<para>Up to samba version 3.4.x a fixed character mapping was used.
+	The invalid windows characters  \ / : * ? " < > | and the blank
+	character were mapped in a hardcoded way.
+	</para>
+
+	<para>Starting with samba-3.5.0 a more flexible mapping was introduced.
+	The new parameter "catia:mappings" now specifies the mapping on a char by char
+	basis using the notation: unix hex char 0x.. : windows hex char 0x..
+	Multiple character mappings are separated by a comma.
+	</para>
+
+
 </refsect1>
 
 
 <refsect1>
 	<title>EXAMPLES</title>
 
+	<para>Samba versions up to 3.4.x:</para>
 	<para>Map Catia filenames on the [CAD] share:</para>
 
 <programlisting>
@@ -51,12 +64,60 @@
 	<smbconfoption name="vfs objects">catia</smbconfoption>
 </programlisting>
 
+	<para>Samba versions 3.5.0 and later:</para>
+	<para>Map Catia filenames on 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>
+</programlisting>
+
+        <para>To get the full formerly fixed mappings:</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,0x20:0xb1</smbconfoption>
+</programlisting>
+
+        <para>Unix filename to be translated (Note that the path delimiter "/" is not used here):
+	</para>
+	<para>a\a:a*a?a"a<a>a|a a</para>
+
+	<para>Resulting windows filename:</para>
+
+	<para>a&#x00ff;a&#x00f7;a&#x00a4;a&#x00bf;a&#x00a8;a&#x00ab;a&#x00bb;a&#x00a6;a&#x00b1;a
+	</para>
+
+        <para>Note that the character mapping must work in BOTH directions
+	(unix -> windows and windows -> unix) to get unique and existing file names!
+	</para>
+
+	<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>
+</programlisting>
+
+         <para>Here the colon ":" is mapped to the underscore "_".</para>
+	 <para>Assuming a unix filename "a:should_work", which is well translated
+	 to windows as "a_should_work".</para>
+	 <para>BUT the reverse mapping from windows "a_should_work" to unix
+	 will result in "a:should:work" - something like "file not found"
+	 will be returned.
+	 </para>
+
 </refsect1>
 
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for all versions up to 4.0.3 of the Samba suite.
 	</para>
 </refsect1>
 
@@ -67,6 +128,7 @@
 	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>
+	<para>New version written by Guenter Kukkukk kukks at samba.org</para>
 
 </refsect1>
 

Modified: trunk/samba/examples/VFS/configure
===================================================================
--- trunk/samba/examples/VFS/configure	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/examples/VFS/configure	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,11 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68.
+# Generated by GNU Autoconf 2.69.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -167,7 +190,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -212,21 +236,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -328,6 +356,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -449,6 +485,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -483,16 +523,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -504,28 +544,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -1152,8 +1172,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1397,9 +1415,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1649,7 +1667,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2024,7 +2042,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2064,7 +2082,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2117,7 +2135,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2158,7 +2176,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -2216,7 +2234,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2260,7 +2278,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2706,8 +2724,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -2858,7 +2875,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -3086,7 +3103,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3350,7 +3367,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -3416,7 +3433,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -3772,7 +3789,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ROFF="groff -etpsR -Tascii -man"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4278,16 +4295,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -4347,29 +4364,17 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
 
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
@@ -4390,7 +4395,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -4452,10 +4457,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -4544,7 +4549,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'

Modified: trunk/samba/librpc/idl/spoolss.idl
===================================================================
--- trunk/samba/librpc/idl/spoolss.idl	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/librpc/idl/spoolss.idl	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1303,7 +1303,8 @@
 		SPOOLSS_DRIVER_VERSION_9X	= 0,
 		SPOOLSS_DRIVER_VERSION_NT35	= 1,
 		SPOOLSS_DRIVER_VERSION_NT4	= 2,
-		SPOOLSS_DRIVER_VERSION_200X	= 3
+		SPOOLSS_DRIVER_VERSION_200X	= 3,
+		SPOOLSS_DRIVER_VERSION_2012	= 4
 	} spoolss_DriverOSVersion;
 
 	typedef struct {

Modified: trunk/samba/packaging/RHEL/makerpms.sh
===================================================================
--- trunk/samba/packaging/RHEL/makerpms.sh	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/packaging/RHEL/makerpms.sh	2013-03-18 18:43:43 UTC (rev 4206)
@@ -20,7 +20,7 @@
 
 USERID=`id -u`
 GRPID=`id -g`
-VERSION='3.6.12'
+VERSION='3.6.13'
 REVISION=''
 SPECFILE="samba.spec"
 RPMVER=`rpm --version | awk '{print $3}'`

Modified: trunk/samba/packaging/RHEL/samba.spec
===================================================================
--- trunk/samba/packaging/RHEL/samba.spec	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/packaging/RHEL/samba.spec	2013-03-18 18:43:43 UTC (rev 4206)
@@ -11,7 +11,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.6.12
+Version:      3.6.13
 Release:      1
 Epoch:        0
 License: GNU GPL version 3

Modified: trunk/samba/packaging/RHEL-CTDB/samba.spec
===================================================================
--- trunk/samba/packaging/RHEL-CTDB/samba.spec	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/packaging/RHEL-CTDB/samba.spec	2013-03-18 18:43:43 UTC (rev 4206)
@@ -5,7 +5,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.6.12
+Version:      3.6.13
 Release:      1GITHASH
 Epoch:        0
 License: GNU GPL version 3

Modified: trunk/samba/source3/VERSION
===================================================================
--- trunk/samba/source3/VERSION	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/VERSION	2013-03-18 18:43:43 UTC (rev 4206)
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=6
-SAMBA_VERSION_RELEASE=12
+SAMBA_VERSION_RELEASE=13
 
 ########################################################
 # Bug fix releases use a letter for the patch revision #

Modified: trunk/samba/source3/auth/auth_util.c
===================================================================
--- trunk/samba/source3/auth/auth_util.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/auth/auth_util.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -120,7 +120,8 @@
 	 * This also deals with the client passing in a "" domain */
 
 	if (!is_trusted_domain(domain) &&
-	    !strequal(domain, my_sam_name()))
+	    !strequal(domain, my_sam_name()) &&
+	    !strequal(domain, get_global_sam_name()))
 	{
 		if (lp_map_untrusted_to_domain())
 			domain = my_sam_name();
@@ -924,7 +925,11 @@
 	result->nss_token = true;
 	result->guest = is_guest;
 
-	status = create_local_token(result);
+	if (is_guest) {
+		status = make_server_info_guest(mem_ctx, &result);
+	} else {
+		status = create_local_token(result);
+	}
 
 	if (!NT_STATUS_IS_OK(status)) {
 		TALLOC_FREE(result);

Modified: trunk/samba/source3/auth/server_info.c
===================================================================
--- trunk/samba/source3/auth/server_info.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/auth/server_info.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -608,9 +608,9 @@
 	info3 = talloc_zero(mem_ctx, struct netr_SamInfo3);
 	if (!info3) return NULL;
 
-	info3->base.last_logon = info->logon_time;
-	info3->base.last_logoff = info->logoff_time;
-	info3->base.acct_expiry = info->kickoff_time;
+	unix_to_nt_time(&info3->base.last_logon, info->logon_time);
+	unix_to_nt_time(&info3->base.last_logoff, info->logoff_time);
+	unix_to_nt_time(&info3->base.acct_expiry, info->kickoff_time);
 	unix_to_nt_time(&info3->base.last_password_change, info->pass_last_set_time);
 	unix_to_nt_time(&info3->base.allow_password_change,
 			info->pass_can_change_time);

Modified: trunk/samba/source3/client/client.c
===================================================================
--- trunk/samba/source3/client/client.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/client/client.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1307,8 +1307,17 @@
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	status = do_list(mget_mask, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,do_mget,false, true);
-	if (!NT_STATUS_IS_OK(status)) {
+	status = do_list(mget_mask,
+			 (FILE_ATTRIBUTE_SYSTEM
+			  | FILE_ATTRIBUTE_HIDDEN
+			  | FILE_ATTRIBUTE_DIRECTORY),
+			 do_mget, false, true);
+	if (!NT_STATUS_IS_OK(status)
+	 && !NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+		/*
+		 * Ignore access denied errors to ensure all permitted files are
+		 * pulled down.
+		 */
 		return status;
 	}
 

Modified: trunk/samba/source3/configure
===================================================================
--- trunk/samba/source3/configure	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/configure	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Samba 3.
+# Generated by GNU Autoconf 2.69 for Samba 3.
 #
 # Report bugs to <samba-technical at samba.org>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +192,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -214,21 +238,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -331,6 +359,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -452,6 +488,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -486,16 +526,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -507,28 +547,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -1487,8 +1507,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1872,9 +1890,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 Samba configure 3
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -2151,7 +2169,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2241,7 +2259,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2257,7 +2276,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2283,7 +2303,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2299,7 +2320,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2333,7 +2355,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2576,7 +2599,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by Samba $as_me 3, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -3762,7 +3785,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3802,7 +3825,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3855,7 +3878,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3896,7 +3919,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3954,7 +3977,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3998,7 +4021,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4444,8 +4467,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4679,7 +4701,7 @@
   return 0;
 }
 _ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"; then :
@@ -4874,7 +4896,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4940,7 +4962,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -5147,8 +5169,8 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#	  define __EXTENSIONS__ 1
-	  $ac_includes_default
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
 int
 main ()
 {
@@ -5635,7 +5657,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -5954,6 +5976,8 @@
 esac
 rm -rf conftest*
   fi
+
+
 fi
 
 
@@ -7022,7 +7046,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7073,7 +7097,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MAKE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7151,7 +7175,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7194,7 +7218,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7263,7 +7287,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7307,7 +7331,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7359,7 +7383,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PYTHON_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7403,7 +7427,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PYTHON_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7676,7 +7700,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7716,7 +7740,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7769,7 +7793,11 @@
 
 
 if test "$ac_cv_prog_gnu_ld" = "yes"; then
-	ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>&1 < /dev/null | grep "GNU ld"`
+	ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2> /dev/null < /dev/null | grep "GNU ld"`
+	# we need to make a 2nd (separate!) check on the output of stderr, see bug #7825:
+	if test -z "$ac_cv_gnu_ld_version" ; then
+	  ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>&1 > /dev/null < /dev/null | grep "GNU ld"`
+	fi
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release date" >&5
 $as_echo_n "checking GNU ld release date... " >&6; }
 		ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
@@ -14508,11 +14536,11 @@
 int
 main ()
 {
-/* FIXME: Include the comments suggested by Paul. */
+
 #ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
+  /* Ultrix mips cc rejects this sort of thing.  */
   typedef int charset[2];
-  const charset cs;
+  const charset cs = { 0, 0 };
   /* SunOS 4.1.1 cc rejects this.  */
   char const *const *pcpcc;
   char **ppc;
@@ -14529,8 +14557,9 @@
   ++pcpcc;
   ppc = (char**) pcpcc;
   pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
+  { /* SCO 3.2v4 cc rejects this sort of thing.  */
+    char tx;
+    char *t = &tx;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
@@ -14546,10 +14575,10 @@
     iptr p = 0;
     ++p;
   }
-  { /* AIX XL C 1.02.0.0 rejects this saying
+  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
+    struct s { int j; const int *ap[3]; } bx;
+    struct s *b = &bx; b->j = 5;
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
@@ -14855,7 +14884,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(((char) -1) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -15081,7 +15111,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16307,7 +16337,7 @@
 fi
 done
 
-for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64
+for ac_func in lstat64 fopen64 atexit grantpt posix_openpt lseek64 ftruncate64 posix_fallocate posix_fallocate64
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -19468,7 +19498,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ROFF="groff -etpsR -Tascii -man"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -20004,7 +20034,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -20047,7 +20077,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -25962,7 +25992,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -41048,16 +41078,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -41117,29 +41147,17 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
 
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
@@ -41160,7 +41178,7 @@
 # values after options handling.
 ac_log="
 This file was extended by Samba $as_me 3, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -41226,10 +41244,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 Samba config.status 3
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -41319,7 +41337,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'

Modified: trunk/samba/source3/configure.in
===================================================================
--- trunk/samba/source3/configure.in	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/configure.in	2013-03-18 18:43:43 UTC (rev 4206)
@@ -231,7 +231,11 @@
 dnl --allow-shlib-undefined flag defined.  This causes a stackload of
 dnl warnings when building modules.
 if test "$ac_cv_prog_gnu_ld" = "yes"; then
-	ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>&1 < /dev/null | grep "GNU ld"`
+	ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2> /dev/null < /dev/null | grep "GNU ld"`
+	# we need to make a 2nd (separate!) check on the output of stderr, see bug #7825:
+	if test -z "$ac_cv_gnu_ld_version" ; then
+	  ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>&1 > /dev/null < /dev/null | grep "GNU ld"`
+	fi
 	AC_MSG_CHECKING(GNU ld release date)
 	changequote(,)dnl
 	ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
@@ -1112,7 +1116,7 @@
 AC_CHECK_FUNCS(initgroups select rdchk getgrnam getgrent pathconf)
 AC_CHECK_FUNCS(getgrset)
 AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups sysconf stat64 fstat64)
-AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64)
+AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt posix_openpt lseek64 ftruncate64 posix_fallocate posix_fallocate64)
 AC_CHECK_FUNCS(fallocate fallocate64)
 AC_CHECK_FUNCS(fseeko fseek64 fseeko64 ftell64 ftello64 setluid getpwanam)
 AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64)

Modified: trunk/samba/source3/include/config.h.in
===================================================================
--- trunk/samba/source3/include/config.h.in	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/include/config.h.in	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1634,6 +1634,9 @@
 /* Define to 1 if you have the `posix_memalign' function. */
 #undef HAVE_POSIX_MEMALIGN
 
+/* Define to 1 if you have the `posix_openpt' function. */
+#undef HAVE_POSIX_OPENPT
+
 /* Whether prctl is available */
 #undef HAVE_PRCTL
 
@@ -3111,6 +3114,11 @@
 /* xattr functions have additional options */
 #undef XATTR_ADD_OPT
 
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
 /* File offset bits */
 #undef _FILE_OFFSET_BITS
 

Modified: trunk/samba/source3/include/version.h
===================================================================
--- trunk/samba/source3/include/version.h	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/include/version.h	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1,8 +1,8 @@
 /* Autogenerated by script/mkversion.sh */
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 6
-#define SAMBA_VERSION_RELEASE 12
-#define SAMBA_VERSION_OFFICIAL_STRING "3.6.12"
+#define SAMBA_VERSION_RELEASE 13
+#define SAMBA_VERSION_OFFICIAL_STRING "3.6.13"
 #ifdef SAMBA_VERSION_VENDOR_FUNCTION
 #  define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
 #else /* SAMBA_VERSION_VENDOR_FUNCTION */

Modified: trunk/samba/source3/lib/util_file.c
===================================================================
--- trunk/samba/source3/lib/util_file.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/lib/util_file.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -38,7 +38,7 @@
 	p = NULL;
 	total = 0;
 
-	while ((n = read(fd, buf, sizeof(buf))) > 0) {
+	while ((n = sys_read(fd, buf, sizeof(buf))) > 0) {
 		p = talloc_realloc(NULL, p, char, total + n + 1);
 		if (!p) {
 		        DEBUG(0,("file_pload: failed to expand buffer!\n"));

Modified: trunk/samba/source3/librpc/gen_ndr/ndr_spoolss.c
===================================================================
--- trunk/samba/source3/librpc/gen_ndr/ndr_spoolss.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/librpc/gen_ndr/ndr_spoolss.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -8799,6 +8799,7 @@
 		case SPOOLSS_DRIVER_VERSION_NT35: val = "SPOOLSS_DRIVER_VERSION_NT35"; break;
 		case SPOOLSS_DRIVER_VERSION_NT4: val = "SPOOLSS_DRIVER_VERSION_NT4"; break;
 		case SPOOLSS_DRIVER_VERSION_200X: val = "SPOOLSS_DRIVER_VERSION_200X"; break;
+		case SPOOLSS_DRIVER_VERSION_2012: val = "SPOOLSS_DRIVER_VERSION_2012"; break;
 	}
 	ndr_print_enum(ndr, name, "ENUM", val, r);
 }

Modified: trunk/samba/source3/librpc/gen_ndr/py_spoolss.c
===================================================================
--- trunk/samba/source3/librpc/gen_ndr/py_spoolss.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/librpc/gen_ndr/py_spoolss.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -31601,6 +31601,7 @@
 	PyModule_AddObject(m, "PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS", PyInt_FromLong(PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS));
 	PyModule_AddObject(m, "PRINTER_STATUS_NO_TONER", PyInt_FromLong(PRINTER_STATUS_NO_TONER));
 	PyModule_AddObject(m, "PRINTER_STATUS_OFFLINE", PyInt_FromLong(PRINTER_STATUS_OFFLINE));
+	PyModule_AddObject(m, "SPOOLSS_DRIVER_VERSION_2012", PyInt_FromLong(SPOOLSS_DRIVER_VERSION_2012));
 	PyModule_AddObject(m, "SPOOLSS_DM_LAYOUT_BOOKLET", PyInt_FromLong(SPOOLSS_DM_LAYOUT_BOOKLET));
 	PyModule_AddObject(m, "DMTT_DOWNLOAD_OUTLINE", PyInt_FromLong(DMTT_DOWNLOAD_OUTLINE));
 	PyModule_AddObject(m, "PRINTER_NOTIFY_FIELD_PORT_NAME", PyInt_FromLong(PRINTER_NOTIFY_FIELD_PORT_NAME));

Modified: trunk/samba/source3/librpc/gen_ndr/spoolss.h
===================================================================
--- trunk/samba/source3/librpc/gen_ndr/spoolss.h	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/librpc/gen_ndr/spoolss.h	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1614,7 +1614,8 @@
 	SPOOLSS_DRIVER_VERSION_9X=(int)(0),
 	SPOOLSS_DRIVER_VERSION_NT35=(int)(1),
 	SPOOLSS_DRIVER_VERSION_NT4=(int)(2),
-	SPOOLSS_DRIVER_VERSION_200X=(int)(3)
+	SPOOLSS_DRIVER_VERSION_200X=(int)(3),
+	SPOOLSS_DRIVER_VERSION_2012=(int)(4)
 }
 #else
  { __donnot_use_enum_spoolss_DriverOSVersion=0x7FFFFFFF}
@@ -1622,6 +1623,7 @@
 #define SPOOLSS_DRIVER_VERSION_NT35 ( 1 )
 #define SPOOLSS_DRIVER_VERSION_NT4 ( 2 )
 #define SPOOLSS_DRIVER_VERSION_200X ( 3 )
+#define SPOOLSS_DRIVER_VERSION_2012 ( 4 )
 #endif
 ;
 

Modified: trunk/samba/source3/modules/vfs_catia.c
===================================================================
--- trunk/samba/source3/modules/vfs_catia.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/modules/vfs_catia.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -10,6 +10,7 @@
  *
  * Copyright (C) Volker Lendecke, 2005
  * Copyright (C) Aravind Srinivasan, 2009
+ * Copyright (C) Guenter Kukkukk, 2013
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +30,11 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 
+static int vfs_catia_debug_level = DBGC_VFS;
+
+#undef DBGC_CLASS
+#define DBGC_CLASS vfs_catia_debug_level
+
 #define GLOBAL_SNUM     0xFFFFFFF
 #define MAP_SIZE        0xFF
 #define MAP_NUM         0x101 /* max unicode charval / MAP_SIZE */
@@ -295,7 +301,7 @@
 {
 	char *name = NULL;
 	char *mapped_name;
-	NTSTATUS ret;
+	NTSTATUS status, ret;
 
 	/*
 	 * Copy the supplied name and free the memory for mapped_name,
@@ -308,12 +314,12 @@
 		errno = ENOMEM;
 		return NT_STATUS_NO_MEMORY;
 	}
-	ret = catia_string_replace_allocate(handle->conn, name,
+	status = catia_string_replace_allocate(handle->conn, name,
 			&mapped_name, direction);
 
 	TALLOC_FREE(name);
-	if (!NT_STATUS_IS_OK(ret)) {
-		return ret;
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
 	}
 
 	ret = SMB_VFS_NEXT_TRANSLATE_NAME(handle, mapped_name, direction,
@@ -321,6 +327,8 @@
 
 	if (NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED)) {
 		*pmapped_name = talloc_move(mem_ctx, &mapped_name);
+		/* we need to return the former translation result here */
+		ret = status;
 	} else {
 		TALLOC_FREE(mapped_name);
 	}
@@ -1020,6 +1028,23 @@
 
 NTSTATUS vfs_catia_init(void)
 {
-        return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "catia",
+	NTSTATUS ret;
+
+        ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "catia",
 				&vfs_catia_fns);
+	if (!NT_STATUS_IS_OK(ret))
+		return ret;
+
+	vfs_catia_debug_level = debug_add_class("catia");
+	if (vfs_catia_debug_level == -1) {
+		vfs_catia_debug_level = DBGC_VFS;
+		DEBUG(0, ("vfs_catia: Couldn't register custom debugging "
+			  "class!\n"));
+	} else {
+		DEBUG(10, ("vfs_catia: Debug class number of "
+			   "'catia': %d\n", vfs_catia_debug_level));
+	}
+
+	return ret;
+
 }

Modified: trunk/samba/source3/passdb/pdb_smbpasswd.c
===================================================================
--- trunk/samba/source3/passdb/pdb_smbpasswd.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/passdb/pdb_smbpasswd.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -736,7 +736,8 @@
 	fstring user_name;
 
 	char *status;
-	char linebuf[256];
+#define LINEBUF_SIZE 255
+	char linebuf[LINEBUF_SIZE + 1];
 	char readbuf[1024];
 	int c;
 	fstring ascii_p16;
@@ -791,7 +792,7 @@
 
 		linebuf[0] = '\0';
 
-		status = fgets(linebuf, sizeof(linebuf), fp);
+		status = fgets(linebuf, LINEBUF_SIZE, fp);
 		if (status == NULL && ferror(fp)) {
 			pw_file_unlock(lockfd, &smbpasswd_state->pw_file_lock_depth);
 			fclose(fp);
@@ -1020,7 +1021,7 @@
 	dump_data(100, (uint8 *)ascii_p16, wr_len);
 #endif
 
-	if(wr_len > sizeof(linebuf)) {
+	if(wr_len > LINEBUF_SIZE) {
 		DEBUG(0, ("mod_smbfilepwd_entry: line to write (%d) is too long.\n", wr_len+1));
 		pw_file_unlock(lockfd,&smbpasswd_state->pw_file_lock_depth);
 		fclose(fp);

Modified: trunk/samba/source3/printing/nt_printing_ads.c
===================================================================
--- trunk/samba/source3/printing/nt_printing_ads.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/printing/nt_printing_ads.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -87,6 +87,86 @@
 	talloc_free(tmp_ctx);
 }
 
+static WERROR nt_printer_info_to_mods(TALLOC_CTX *ctx,
+				      struct spoolss_PrinterInfo2 *info2,
+				      ADS_MODLIST *mods)
+{
+	char *info_str;
+
+	ads_mod_str(ctx, mods, SPOOL_REG_PRINTERNAME, info2->sharename);
+	ads_mod_str(ctx, mods, SPOOL_REG_SHORTSERVERNAME, global_myname());
+	ads_mod_str(ctx, mods, SPOOL_REG_SERVERNAME, get_mydnsfullname());
+
+	info_str = talloc_asprintf(ctx, "\\\\%s\\%s",
+				   get_mydnsfullname(), info2->sharename);
+	if (info_str == NULL) {
+		return WERR_NOMEM;
+	}
+	ads_mod_str(ctx, mods, SPOOL_REG_UNCNAME, info_str);
+
+	info_str = talloc_asprintf(ctx, "%d", 4);
+	if (info_str == NULL) {
+		return WERR_NOMEM;
+	}
+	ads_mod_str(ctx, mods, SPOOL_REG_VERSIONNUMBER, info_str);
+
+	/* empty strings in the mods list result in an attrubute error */
+	if (strlen(info2->drivername) != 0)
+		ads_mod_str(ctx, mods, SPOOL_REG_DRIVERNAME, info2->drivername);
+	if (strlen(info2->location) != 0)
+		ads_mod_str(ctx, mods, SPOOL_REG_LOCATION, info2->location);
+	if (strlen(info2->comment) != 0)
+		ads_mod_str(ctx, mods, SPOOL_REG_DESCRIPTION, info2->comment);
+	if (strlen(info2->portname) != 0)
+		ads_mod_str(ctx, mods, SPOOL_REG_PORTNAME, info2->portname);
+	if (strlen(info2->sepfile) != 0)
+		ads_mod_str(ctx, mods, SPOOL_REG_PRINTSEPARATORFILE, info2->sepfile);
+
+	info_str = talloc_asprintf(ctx, "%u", info2->starttime);
+	if (info_str == NULL) {
+		return WERR_NOMEM;
+	}
+	ads_mod_str(ctx, mods, SPOOL_REG_PRINTSTARTTIME, info_str);
+
+	info_str = talloc_asprintf(ctx, "%u", info2->untiltime);
+	if (info_str == NULL) {
+		return WERR_NOMEM;
+	}
+	ads_mod_str(ctx, mods, SPOOL_REG_PRINTENDTIME, info_str);
+
+	info_str = talloc_asprintf(ctx, "%u", info2->priority);
+	if (info_str == NULL) {
+		return WERR_NOMEM;
+	}
+	ads_mod_str(ctx, mods, SPOOL_REG_PRIORITY, info_str);
+
+	if (info2->attributes & PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS) {
+		ads_mod_str(ctx, mods, SPOOL_REG_PRINTKEEPPRINTEDJOBS, "TRUE");
+	} else {
+		ads_mod_str(ctx, mods, SPOOL_REG_PRINTKEEPPRINTEDJOBS, "FALSE");
+	}
+
+	switch (info2->attributes & 0x3) {
+	case 0:
+		ads_mod_str(ctx, mods, SPOOL_REG_PRINTSPOOLING,
+			    SPOOL_REGVAL_PRINTWHILESPOOLING);
+		break;
+	case 1:
+		ads_mod_str(ctx, mods, SPOOL_REG_PRINTSPOOLING,
+			    SPOOL_REGVAL_PRINTAFTERSPOOLED);
+		break;
+	case 2:
+		ads_mod_str(ctx, mods, SPOOL_REG_PRINTSPOOLING,
+			    SPOOL_REGVAL_PRINTDIRECT);
+		break;
+	default:
+		DEBUG(3, ("unsupported printer attributes %x\n",
+			  info2->attributes));
+	}
+
+	return WERR_OK;
+}
+
 static WERROR nt_printer_publish_ads(struct messaging_context *msg_ctx,
 				     ADS_STRUCT *ads,
 				     struct spoolss_PrinterInfo2 *pinfo2)
@@ -167,12 +247,15 @@
 	mods = ads_init_mods(ctx);
 
 	if (mods == NULL) {
-		SAFE_FREE(prt_dn);
 		TALLOC_FREE(ctx);
 		return WERR_NOMEM;
 	}
 
-	ads_mod_str(ctx, &mods, SPOOL_REG_PRINTERNAME, printer);
+	win_rc = nt_printer_info_to_mods(ctx, pinfo2, &mods);
+	if (!W_ERROR_IS_OK(win_rc)) {
+		TALLOC_FREE(ctx);
+		return win_rc;
+	}
 
 	/* publish it */
 	ads_rc = ads_mod_printer_entry(ads, prt_dn, ctx, &mods);

Modified: trunk/samba/source3/rpc_server/samr/srv_samr_chgpasswd.c
===================================================================
--- trunk/samba/source3/rpc_server/samr/srv_samr_chgpasswd.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/rpc_server/samr/srv_samr_chgpasswd.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -73,8 +73,13 @@
 	*slave = NULL;
 
 #if defined(HAVE_GRANTPT)
+#if defined(HAVE_POSIX_OPENPT)
+	master = posix_openpt(O_RDWR|O_NOCTTY);
+#else
 	/* Try to open /dev/ptmx. If that fails, fall through to old method. */
-	if ((master = sys_open("/dev/ptmx", O_RDWR, 0)) >= 0) {
+	master = sys_open("/dev/ptmx", O_RDWR, 0);
+#endif
+	if (master >= 0) {
 		grantpt(master);
 		unlockpt(master);
 		line = (char *)ptsname(master);

Modified: trunk/samba/source3/rpc_server/spoolss/srv_spoolss_nt.c
===================================================================
--- trunk/samba/source3/rpc_server/spoolss/srv_spoolss_nt.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/rpc_server/spoolss/srv_spoolss_nt.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -4442,7 +4442,8 @@
 
 	DEBUG(4,("enum_all_printers_info_1_name\n"));
 
-	if ((servername[0] == '\\') && (servername[1] == '\\')) {
+	if (servername != NULL &&
+	    (servername[0] == '\\') && (servername[1] == '\\')) {
 		s = servername + 2;
 	}
 
@@ -4477,7 +4478,8 @@
 	   listed. Windows responds to this call with a
 	   WERR_CAN_NOT_COMPLETE so we should do the same. */
 
-	if (servername[0] == '\\' && servername[1] == '\\') {
+	if (servername != NULL &&
+	    (servername[0] == '\\') && (servername[1] == '\\')) {
 		 s = servername + 2;
 	}
 
@@ -5607,6 +5609,7 @@
 {
 	struct printer_handle *printer;
 	WERROR result;
+	uint32_t version = r->in.client_major_version;
 
 	int snum;
 
@@ -5631,13 +5634,19 @@
 		return WERR_BADFID;
 	}
 
+	if (r->in.client_major_version == SPOOLSS_DRIVER_VERSION_2012) {
+		DEBUG(3,("_spoolss_GetPrinterDriver2: v4 driver requested, "
+			"downgrading to v3\n"));
+		version = SPOOLSS_DRIVER_VERSION_200X;
+	}
+
 	result = construct_printer_driver_info_level(p->mem_ctx,
 						     get_session_info_system(),
 						     p->msg_ctx,
 						     r->in.level, r->out.info,
 						     snum, printer->servername,
 						     r->in.architecture,
-						     r->in.client_major_version);
+						     version);
 	if (!W_ERROR_IS_OK(result)) {
 		TALLOC_FREE(r->out.info);
 		return result;

Modified: trunk/samba/source3/selftest/skip
===================================================================
--- trunk/samba/source3/selftest/skip	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/selftest/skip	2013-03-18 18:43:43 UTC (rev 4206)
@@ -13,6 +13,7 @@
 samba3.smbtorture_s3.*.utable
 samba3.smbtorture_s3.*.pipe_number
 samba3.smbtorture_s3.*.CHAIN1
+samba3.smbtorture_s3.*.DIR1 #loops on 64 bit linux with ext4
 samba3.*base.charset
 samba3.*raw.acls
 samba3.*raw.composite

Modified: trunk/samba/source3/smbd/globals.h
===================================================================
--- trunk/samba/source3/smbd/globals.h	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/smbd/globals.h	2013-03-18 18:43:43 UTC (rev 4206)
@@ -179,6 +179,7 @@
 			 uint16_t info_level,
 			 uint16_t flags2,
 			 unsigned int max_data_bytes,
+			 struct smb_filename *smb_fname,
 			 char **ppdata,
 			 int *ret_data_len);
 

Modified: trunk/samba/source3/smbd/msdfs.c
===================================================================
--- trunk/samba/source3/smbd/msdfs.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/smbd/msdfs.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -974,6 +974,19 @@
 	if (!NT_STATUS_EQUAL(status, NT_STATUS_PATH_NOT_COVERED)) {
 		DEBUG(3,("get_referred_path: No valid referrals for path %s\n",
 			dfs_path));
+		if (NT_STATUS_IS_OK(status)) {
+			/*
+			 * We are in an error path here (we
+			 * know it's not a DFS path), but
+			 * dfs_path_lookup() can return
+			 * NT_STATUS_OK. Ensure we always
+			 * return a valid error code.
+			 *
+			 * #9588 - ACLs are not inherited to directories
+			 *         for DFS shares.
+			 */
+			status = NT_STATUS_NOT_FOUND;
+		}
 		goto err_exit;
 	}
 

Modified: trunk/samba/source3/smbd/reply.c
===================================================================
--- trunk/samba/source3/smbd/reply.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/smbd/reply.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -6187,7 +6187,8 @@
 			  "%s -> %s\n", smb_fname_str_dbg(fsp->fsp_name),
 			  smb_fname_str_dbg(smb_fname_dst)));
 
-		if (!lp_posix_pathnames() &&
+		if (!fsp->is_directory &&
+		    !lp_posix_pathnames() &&
 		    (lp_map_archive(SNUM(conn)) ||
 		    lp_store_dos_attributes(SNUM(conn)))) {
 			/* We must set the archive bit on the newly

Modified: trunk/samba/source3/smbd/sesssetup.c
===================================================================
--- trunk/samba/source3/smbd/sesssetup.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/smbd/sesssetup.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -905,6 +905,13 @@
 			(unsigned int)copy_len,
 			(unsigned int)pblob->length ));
 
+		if (pblob->length > pad->needed_len) {
+			DEBUG(2, ("subsequent security token data length %u "
+				  "exceeds expected length %u\n",
+				  (unsigned int)pblob->length,
+				  (unsigned int)pad->needed_len));
+		}
+
 		tmp_blob = data_blob(NULL,
 				pad->partial_data.length + copy_len);
 
@@ -1165,13 +1172,18 @@
 
 	status = check_spnego_blob_complete(sconn, smbpid, vuid, &blob1);
 	if (!NT_STATUS_IS_OK(status)) {
+		/*
+		 * Pack error response, ensuring to fill NativeOS, NativeLanMan
+		 * & PrimaryDomain fields on NT_STATUS_MORE_PROCESSING_REQUIRED
+		 */
+		reply_outbuf(req, 4, 0);
+		reply_sesssetup_blob(req, data_blob_null, status);
 		if (!NT_STATUS_EQUAL(status,
 				NT_STATUS_MORE_PROCESSING_REQUIRED)) {
 			/* Real error - kill the intermediate vuid */
 			invalidate_vuid(sconn, vuid);
 		}
 		data_blob_free(&blob1);
-		reply_nterror(req, nt_status_squash(status));
 		return;
 	}
 

Modified: trunk/samba/source3/smbd/smb2_getinfo.c
===================================================================
--- trunk/samba/source3/smbd/smb2_getinfo.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/smbd/smb2_getinfo.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -404,6 +404,7 @@
 					 file_info_level,
 					 STR_UNICODE,
 					 in_output_buffer_length,
+					 fsp->fsp_name,
 					 &data,
 					 &data_size);
 		if (!NT_STATUS_IS_OK(status)) {

Modified: trunk/samba/source3/smbd/smb2_server.c
===================================================================
--- trunk/samba/source3/smbd/smb2_server.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/smbd/smb2_server.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1802,6 +1802,25 @@
 		if (!im) {
 			return NT_STATUS_NO_MEMORY;
 		}
+
+		if (req->do_signing) {
+			/*
+			 * We sign each reply as we go along.
+			 * We can do this as smb2_calculate_credits()
+			 * grants zero credits on every part of a
+			 * compound reply except the last one,
+			 * which is signed just before calling
+			 * tstream_writev_queue_send().
+			 */
+			NTSTATUS status;
+			status = smb2_signing_sign_pdu(req->session->session_key,
+					       &req->out.vector[i], 3);
+			if (!NT_STATUS_IS_OK(status)) {
+				TALLOC_FREE(im);
+				return status;
+			}
+		}
+
 		tevent_schedule_immediate(im,
 					req->sconn->smb2.event_ctx,
 					smbd_smb2_request_dispatch_immediate,

Modified: trunk/samba/source3/smbd/trans2.c
===================================================================
--- trunk/samba/source3/smbd/trans2.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/smbd/trans2.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -2921,6 +2921,7 @@
 			 uint16_t info_level,
 			 uint16_t flags2,
 			 unsigned int max_data_bytes,
+			 struct smb_filename *fname,
 			 char **ppdata,
 			 int *ret_data_len)
 {
@@ -2929,10 +2930,17 @@
 	const char *vname = volume_label(SNUM(conn));
 	int snum = SNUM(conn);
 	char *fstype = lp_fstype(SNUM(conn));
+	const char *filename = NULL;
 	uint32 additional_flags = 0;
-	struct smb_filename smb_fname_dot;
+	struct smb_filename smb_fname;
 	SMB_STRUCT_STAT st;
 
+	if (fname == NULL || fname->base_name == NULL) {
+		filename = ".";
+	} else {
+		filename = fname->base_name;
+	}
+
 	if (IS_IPC(conn)) {
 		if (info_level != SMB_QUERY_CIFS_UNIX_INFO) {
 			DEBUG(0,("smbd_do_qfsinfo: not an allowed "
@@ -2944,15 +2952,15 @@
 
 	DEBUG(3,("smbd_do_qfsinfo: level = %d\n", info_level));
 
-	ZERO_STRUCT(smb_fname_dot);
-	smb_fname_dot.base_name = discard_const_p(char, ".");
+	ZERO_STRUCT(smb_fname);
+	smb_fname.base_name = discard_const_p(char, filename);
 
-	if(SMB_VFS_STAT(conn, &smb_fname_dot) != 0) {
+	if(SMB_VFS_STAT(conn, &smb_fname) != 0) {
 		DEBUG(2,("stat of . failed (%s)\n", strerror(errno)));
 		return map_nt_error_from_unix(errno);
 	}
 
-	st = smb_fname_dot.st;
+	st = smb_fname.st;
 
 	*ppdata = (char *)SMB_REALLOC(
 		*ppdata, max_data_bytes + DIR_ENTRY_SAFETY_MARGIN);
@@ -2969,7 +2977,7 @@
 		{
 			uint64_t dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
 			data_len = 18;
-			if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (uint64_t)-1) {
+			if (get_dfree_info(conn,filename,False,&bsize,&dfree,&dsize) == (uint64_t)-1) {
 				return map_nt_error_from_unix(errno);
 			}
 
@@ -3092,7 +3100,7 @@
 		{
 			uint64_t dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
 			data_len = 24;
-			if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (uint64_t)-1) {
+			if (get_dfree_info(conn,filename,False,&bsize,&dfree,&dsize) == (uint64_t)-1) {
 				return map_nt_error_from_unix(errno);
 			}
 			block_size = lp_block_size(snum);
@@ -3124,7 +3132,7 @@
 		{
 			uint64_t dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
 			data_len = 32;
-			if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (uint64_t)-1) {
+			if (get_dfree_info(conn,filename,False,&bsize,&dfree,&dsize) == (uint64_t)-1) {
 				return map_nt_error_from_unix(errno);
 			}
 			block_size = lp_block_size(snum);
@@ -3317,7 +3325,7 @@
 				return NT_STATUS_INVALID_LEVEL;
 			}
 
-			rc = SMB_VFS_STATVFS(conn, ".", &svfs);
+			rc = SMB_VFS_STATVFS(conn, filename, &svfs);
 
 			if (!rc) {
 				data_len = 56;
@@ -3510,6 +3518,7 @@
 				 info_level,
 				 req->flags2,
 				 max_data_bytes,
+				 NULL,
 				 ppdata, &data_len);
 	if (!NT_STATUS_IS_OK(status)) {
 		reply_nterror(req, status);
@@ -7328,12 +7337,19 @@
 			/* File exists open. File not exist create. */
 			create_disp = FILE_OPEN_IF;
 			break;
+		case SMB_O_EXCL:
+			/* O_EXCL on its own without O_CREAT is undefined.
+			   We deliberately ignore it as some versions of
+			   Linux CIFSFS can send a bare O_EXCL on the
+			   wire which other filesystems in the kernel
+			   ignore. See bug 9519 for details. */
+
+			/* Fallthrough. */
+
 		case 0:
 			/* File exists open. File not exist fail. */
 			create_disp = FILE_OPEN;
 			break;
-		case SMB_O_EXCL:
-			/* O_EXCL on its own without O_CREAT is undefined. */
 		default:
 			DEBUG(5,("smb_posix_open: invalid create mode 0x%x\n",
 				(unsigned int)wire_open_mode ));
@@ -7586,8 +7602,8 @@
 				continue;
 			}
 			/* Fail with sharing violation. */
+			TALLOC_FREE(lck);
 			close_file(req, fsp, NORMAL_CLOSE);
-			TALLOC_FREE(lck);
 			return NT_STATUS_SHARING_VIOLATION;
 		}
 	}
@@ -7601,12 +7617,12 @@
 						fsp,
 						smb_fname);
 
+	TALLOC_FREE(lck);
+
 	if (!NT_STATUS_IS_OK(status)) {
 		close_file(req, fsp, NORMAL_CLOSE);
-		TALLOC_FREE(lck);
 		return status;
 	}
-	TALLOC_FREE(lck);
 	return close_file(req, fsp, NORMAL_CLOSE);
 }
 

Modified: trunk/samba/source3/winbindd/winbindd_cache.c
===================================================================
--- trunk/samba/source3/winbindd/winbindd_cache.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/winbindd/winbindd_cache.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -2130,6 +2130,7 @@
 				} else {
 					/* something's definitely wrong */
 					result = centry->status;
+					centry_free(centry);
 					goto error;
 				}
 

Modified: trunk/samba/source3/winbindd/winbindd_cm.c
===================================================================
--- trunk/samba/source3/winbindd/winbindd_cm.c	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/winbindd/winbindd_cm.c	2013-03-18 18:43:43 UTC (rev 4206)
@@ -1023,6 +1023,9 @@
 	if ( !(*cli)->domain[0] ) {
 		result = cli_set_domain((*cli), domain->name);
 		if (!NT_STATUS_IS_OK(result)) {
+			SAFE_FREE(ipc_username);
+			SAFE_FREE(ipc_domain);
+			SAFE_FREE(ipc_password);
 			return result;
 		}
 	}

Modified: trunk/samba/source3/wscript
===================================================================
--- trunk/samba/source3/wscript	2013-03-18 18:39:32 UTC (rev 4205)
+++ trunk/samba/source3/wscript	2013-03-18 18:43:43 UTC (rev 4206)
@@ -123,7 +123,7 @@
     conf.CHECK_FUNCS('sigprocmask sigblock sigaction sigset innetgr')
     conf.CHECK_FUNCS('initgroups select poll rdchk getgrnam getgrent pathconf')
     conf.CHECK_FUNCS('setpriv setgidx setuidx setgroups sysconf stat64 fstat64')
-    conf.CHECK_FUNCS('lstat64 fopen64 atexit grantpt lseek64 ftruncate64 fallocate fallocate64 posix_fallocate posix_fallocate64')
+    conf.CHECK_FUNCS('lstat64 fopen64 atexit grantpt posix_openpt lseek64 ftruncate64 fallocate fallocate64 posix_fallocate posix_fallocate64')
     conf.CHECK_FUNCS('fseeko fseek64 fseeko64 ftell64 ftello64 setluid')
     conf.CHECK_FUNCS('getpwnam', headers='sys/types.h pwd.h')
     conf.CHECK_FUNCS('opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64')





More information about the Pkg-samba-maint mailing list