Merge ~ahasenack/ubuntu/+source/samba:disco-samba-4.10.0 into ubuntu/+source/samba:ubuntu/devel

[Andreas Hasenack]

Update samba to final 4.10.0.

Just minor changes were needed. The cmocka build-depends is something I missed in the previous upload, but was already required.

Regarding the dfsg orig tarball, it won't matter if I get its contents correct or not: it will have a different md5 from debian's:

$ for n in 1 2; do tar czf new${n}.tar.gz samba-4.10.0; md5sum new${n}.tar.gz; done
4cc195470df0e948470711869a13122a new1.tar.gz
8b5faf77bec0e5aca0129b0942df9abc new2.tar.gz

I contacted Debian, and the maintainer said he would generate a dfsg tarball this week. But given we have beta freeze next Monday, we might have to upload before that tarball becomes available.

I can still mangle the version, adding ~ubuntu, or using ~dfsg instead of +dfsg. Or we just bite the bullet for this 4.10.0 version.

You can get a copy of the dfsg tarball I generated here: https://launchpad.net/~ahasenack/+archive/ubuntu/samba-4.10/+sourcefiles/samba/2:4.10.0+dfsg-0ubuntu1~ppa1/samba_4.10.0+dfsg.orig.tar.xz

I used debian's procedure described in debian/README.source.md, and it produced one with the same content as when I just added the exclusions from debian/gbp.conf, i.e.:

tar --exclude='source4/heimdal/lib/wind/rfc*txt' --exclude='source4/ldap_server/devdocs' --exclude='*chm' -czf samba_4.10.0+dfsg.orig.tar.gz samba-4.10.0

[Andreas Hasenack (ahasenack)]

The bileto ticket at https://bileto.ubuntu.com/#/ticket/3683 shows a real failure for autofs tests.

I troubleshooted that and determined it's a kernel bug[1]. I confirmed locally in a VM that just switching the kernel makes the guest mount fail.

The last time the autofs tests ran[2], and that run was already including samba 4.10 (rc4), the running kernel was 4.19:
...
autopkgtest [14:57:44]: testbed running kernel: Linux 4.19.0-13-generic #14-Ubuntu SMP Thu Feb 7 21:51:25 UTC 2019
...
smb-mount PASS

The current run[3] in the bileto ticket shows:
...
autopkgtest [14:54:53]: testbed running kernel: Linux 5.0.0-7-generic #8-Ubuntu SMP Mon Mar 4 16:27:25 UTC 2019
...
autopkgtest [14:55:15]: test smb-mount: [-----------------------
...
grep: /cifs/127.0.0.1/pub/hello-public.txt: No such file or directory
...
smb-mount FAIL non-zero exit status 2

The 127.0.0.1 mountpoint is exactly the unauthenticated one (aka, guest).

The samba tests themselves also test cifs[4], but only an authenticated mount, not a guest one.

1. https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1821053
2. https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-disco/disco/amd64/a/autofs/20190311_145953_69000@/log.gz
3. https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-disco-ci-train-ppa-service-3683/disco/amd64/a/autofs/20190320_145718_c773a@/log.gz
4. https://git.launchpad.net/ubuntu/+source/samba/tree/debian/tests/cifs-share-access

[Andreas Hasenack (ahasenack)]

A test kernel I was given didn't fix the problem. When the time comes, I'll propose a test hint mentioning the kernel bug.

[Christian Ehrhardt  (paelzer)]

Last time (-rc4) you had all the other components nbd/talloc/... any changes to those needed as well?

[Christian Ehrhardt  (paelzer)]

For the Tarball I'd recommend, if you get Debians tarball until Friday use that.
Otherwise give it a ...ubuntu name.
I'm really afraid of the subtle and not so subtle follow on pain by "biting the bullet" in this case.

[Christian Ehrhardt  (paelzer)]

Minor questions, but nothing stopping you at all.
Actually not even questions more suggestions since I was forced to look closer to the packaging.

I wondered if bumping libmocka-dev was important, neither it not libcmocka0 is in main
is another dead dependency - I see i used in build as -lcmocka, but no package
eventually gains a dependency.
Well the name suggests it already, it turns out to be used for the tests only.
One feature for the samba build down the road could be implementing nocheck/nodoc.
I haven't seen it in d/rules yet.
Not only does it make certain build types faster (nice to have).
But also would it clearly mark such dependencies in d/control to be easily
identified as test/doc only depends.

libsamba-passdb.so.0.27.2 got a soname bump, but saw no .symbols update.
Due to that I realized that this has no .symbols tracking - is there a reason for that?

The changes LGTM +1

review: Approve

[Andreas Hasenack (ahasenack)]

> Last time (-rc4) you had all the other components nbd/talloc/... any changes
> to those needed as well?

Nope, they are all current and at the correct versions needed by samba.

[Andreas Hasenack (ahasenack)]

> For the Tarball I'd recommend, if you get Debians tarball until Friday use
> that.
> Otherwise give it a ...ubuntu name.
> I'm really afraid of the subtle and not so subtle follow on pain by "biting
> the bullet" in this case.

Ok, +1

[Andreas Hasenack (ahasenack)]

> Minor questions, but nothing stopping you at all.
> Actually not even questions more suggestions since I was forced to look closer
> to the packaging.
>
>
> I wondered if bumping libmocka-dev was important, neither it not libcmocka0 is
> in main
> is another dead dependency - I see i used in build as -lcmocka, but no
> package
> eventually gains a dependency.
> Well the name suggests it already, it turns out to be used for the tests only.

Correct, only for tests. Not even the samba-testsuite package depends on it. I didn't check if it's statically used, though.

As for the bump itself, it's just about correctness.

> One feature for the samba build down the road could be implementing
> nocheck/nodoc.

The tests have been specifically disabled at package build time:
override_dh_auto_test:
    # Running make test requires configuration with --enable-selftest, which
    # we don't want to do for production systems.

But nodoc could be done in the future, yes.

> I haven't seen it in d/rules yet.
> Not only does it make certain build types faster (nice to have).
> But also would it clearly mark such dependencies in d/control to be easily
> identified as test/doc only depends.
>
> libsamba-passdb.so.0.27.2 got a soname bump, but saw no .symbols update.
> Due to that I realized that this has no .symbols tracking - is there a reason
> for that?

It's an internal api, and it was subject of a somewhat heated discussion recently, because FreeIPA (ab)uses it:

https://lists.samba.org/archive/samba-technical/2019-March/132824.html

[Andreas Hasenack (ahasenack)]

> > libsamba-passdb.so.0.27.2 got a soname bump, but saw no .symbols update.
> > Due to that I realized that this has no .symbols tracking - is there a
> reason
> > for that?
>
> It's an internal api, and it was subject of a somewhat heated discussion
> recently, because FreeIPA (ab)uses it:
>
> https://lists.samba.org/archive/samba-technical/2019-March/132824.html

A more specific link:
https://lists.samba.org/archive/samba-technical/2019-March/132834.html

[Andreas Hasenack (ahasenack)]

Entering holding pattern, waiting for a new samba tarball. Deadline tomorrow, Fri Mar 21st.

[Andreas Hasenack (ahasenack)]

I pushed a fix for LP: #1820846, upstream is very very close to merging it.

[Christian Ehrhardt  (paelzer)]

I reviewed the updates you did for LP: #1820846 LGTM +1
It doesn't matter too much if upstream adds that with/without a test eventually.
As long as the fix is correct that should be fine for your coming upload.

review: Approve

[Andreas Hasenack (ahasenack)]

I see a new tarball from debian, grabbing it.

[Andreas Hasenack (ahasenack)]

Tagged and uploaded:
$ git push pkg upload/2%4.10.0+dfsg-0ubuntu1
Enumerating objects: 369, done.
Counting objects: 100% (369/369), done.
Delta compression using up to 4 threads
Compressing objects: 100% (24/24), done.
Writing objects: 100% (194/194), 28.98 KiB | 1.16 MiB/s, done.
Total 194 (delta 181), reused 178 (delta 169)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/samba
 * [new tag] upload/2%4.10.0+dfsg-0ubuntu1 -> upload/2%4.10.0+dfsg-0ubuntu1

$ dput ubuntu ../samba_4.10.0+dfsg-0ubuntu1_source.changes
Checking signature on .changes
gpg: ../samba_4.10.0+dfsg-0ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../samba_4.10.0+dfsg-0ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading samba_4.10.0+dfsg-0ubuntu1.dsc: done.
  Uploading samba_4.10.0+dfsg.orig.tar.xz: done.
  Uploading samba_4.10.0+dfsg-0ubuntu1.debian.tar.xz: done.
  Uploading samba_4.10.0+dfsg-0ubuntu1_source.buildinfo: done.
  Uploading samba_4.10.0+dfsg-0ubuntu1_source.changes: done.
Successfully uploaded packages.

orig tarball generated from debian's salsa pristine-tar branch:
16bdf3bf99f9766c6cd0b840e27e0c98615fa684 samba_4.10.0+dfsg.orig.tar.xz

[Andreas Hasenack (ahasenack)]

This migrated.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04d57cb..4249f52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,12 +7,7 @@ variables:
   GIT_DEPTH: "3"
 
 before_script:
-  - echo "Build starting (preparing swap)..."
-  - if [ $(df -m / --output=avail | tail -n1) -gt 10240 ]; then
-      sudo dd if=/dev/zero of=/samba-swap bs=1M count=6144;
-      sudo mkswap /samba-swap;
-      sudo swapon /samba-swap;
-    fi
+  - echo "Build starting..."
 
 after_script:
   - tar -xf logs.tar.gz system-info.txt -O
@@ -61,6 +56,16 @@ build_samba_ad_dc_2:
     # this one takes about 1 hours to finish
     - script/autobuild.py samba-ad-dc-2     --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
+build_samba_ad_dc_backup:
+  <<: *shared_template
+  script:
+    - script/autobuild.py samba-ad-dc-backup    --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+
+build_samba_ad_dc_backup_py2:
+  <<: *shared_template
+  script:
+    - script/autobuild.py samba-ad-dc-backup-py2    --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+
 build_samba_ad_dc_2_py2:
   <<: *shared_template
   script:
diff --git a/VERSION b/VERSION
index a07b000..4882039 100644
--- a/VERSION
+++ b/VERSION
@@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE=
 # e.g. SAMBA_VERSION_RC_RELEASE=1                      #
 #  ->  "3.0.0rc1"                                      #
 ########################################################
-SAMBA_VERSION_RC_RELEASE=4
+SAMBA_VERSION_RC_RELEASE=
 
 ########################################################
 # To mark SVN snapshots this should be set to 'yes'    #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 875d168..5d3d23a 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,16 +1,11 @@
-Release Announcements
-=====================
+                   ==============================
+                   Release Notes for Samba 4.10.0
+                           March 19, 2019
+		   ==============================
 
-This is the fourth release candidate of Samba 4.10.  This is *not*
-intended for production environments and is designed for testing
-purposes only.  Please report any defects via the Samba bug reporting
-system at https://bugzilla.samba.org/.
 
-Samba 4.10 will be the next version of the Samba suite.
-
-
-UPGRADING
-=========
+This is the first stable release of the Samba 4.10 release series.
+Please read the release notes carefully before upgrading.
 
 
 NEW FEATURES/CHANGES
@@ -194,6 +189,19 @@ DC that had SMBv1 disabled. SMBv2 support has now been added for samba-tool.
 The affected commands are 'samba-tool domain backup|rename' and the
 'samba-tool gpo' set of commands. Refer also bug #13676.
 
+New glusterfs_fuse VFS module
+-----------------------------
+
+The new vfs_glusterfs_fuse module improves performance when Samba
+accesses a glusterfs volume mounted via FUSE (Filesystem in Userspace
+as part of the Linux kernel). It achieves that by leveraging a
+mechanism to retrieve the appropriate case of filenames by querying a
+specific extended attribute in the filesystem. No extra configuration
+is required to use this module, only glusterfs_fuse needs to be set in
+the "vfs objects" parameter. Further details can be found in the
+vfs_glusterfs_fuse(8) manpage. This new vfs_glusterfs_fuse module does
+not replace the existing vfs_glusterfs module, it just provides an
+additional, alternative mechanism to access a Gluster volume.
 
 REMOVED FEATURES
 ================
@@ -242,6 +250,34 @@ smb.conf changes
                               sharemode" but for SMB getinfo
 
 
+CHANGES SINCE 4.10.0rc4
+=======================
+
+o  Andrew Bartlett <[e-mail]>
+   * BUG 13760: s4-server: Open and close a transaction on sam.ldb at startup.
+
+o  Ralph Boehme <[e-mail]>
+   * BUG 13812: access_check_max_allowed() doesn't process "Owner Rights" ACEs.
+
+o  Joe Guo <[e-mail]>
+   * s4/scripting/bin: Open unicode files with utf8 encoding and write
+   * unicode string.
+
+o  Björn Jacke <[e-mail]>
+   * BUG 13759: sambaundoguididx: Use the right escaped oder unescaped sam ldb
+     files.
+
+o  Volker Lendecke <[e-mail]>
+   * BUG 13813: Fix idmap cache pollution with S-1-22- IDs on winbind hickup.
+
+o  Christof Schmitt <[e-mail]>
+   * passdb: Update ABI to 0.27.2.
+   * BUG 13813: lib/winbind_util: Add winbind_xid_to_sid for --without-winbind.
+
+o  Andreas Schneider <[e-mail]>
+   * BUG 13823: lib:util: Move debug message for mkdir failing to log level 1.
+
+
 CHANGES SINCE 4.10.0rc3
 =======================
 
diff --git a/ctdb/doc/ctdb-etcd.7 b/ctdb/doc/ctdb-etcd.7
index 672ded9..655ca93 100644
--- a/ctdb/doc/ctdb-etcd.7
+++ b/ctdb/doc/ctdb-etcd.7
@@ -2,12 +2,12 @@
 .\"     Title: ctdb-etcd
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB\-ETCD" "7" "03/06/2019" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB\-ETCD" "7" "03/19/2019" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ctdb/doc/ctdb-script.options.5 b/ctdb/doc/ctdb-script.options.5
index 44dd0c2..381d9ed 100644
--- a/ctdb/doc/ctdb-script.options.5
+++ b/ctdb/doc/ctdb-script.options.5
@@ -2,12 +2,12 @@
 .\"     Title: ctdb-script.options
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB\-SCRIPT\&.OPTIO" "5" "03/06/2019" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB\-SCRIPT\&.OPTIO" "5" "03/19/2019" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ctdb/doc/ctdb-statistics.7 b/ctdb/doc/ctdb-statistics.7
index 0b9c9f0..e4d049f 100644
--- a/ctdb/doc/ctdb-statistics.7
+++ b/ctdb/doc/ctdb-statistics.7
@@ -2,12 +2,12 @@
 .\"     Title: ctdb-statistics
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB\-STATISTICS" "7" "03/06/2019" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB\-STATISTICS" "7" "03/19/2019" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ctdb/doc/ctdb-tunables.7 b/ctdb/doc/ctdb-tunables.7
index 77559e1..0ca4cf1 100644
--- a/ctdb/doc/ctdb-tunables.7
+++ b/ctdb/doc/ctdb-tunables.7
@@ -2,12 +2,12 @@
 .\"     Title: ctdb-tunables
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB\-TUNABLES" "7" "03/06/2019" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB\-TUNABLES" "7" "03/19/2019" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ctdb/doc/ctdb.1 b/ctdb/doc/ctdb.1
index 41ddabb..c8999ba 100644
--- a/ctdb/doc/ctdb.1
+++ b/ctdb/doc/ctdb.1
@@ -2,12 +2,12 @@
 .\"     Title: ctdb
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB" "1" "03/06/2019" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB" "1" "03/19/2019" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ctdb/doc/ctdb.7 b/ctdb/doc/ctdb.7
index 230b825..4f725ff 100644
--- a/ctdb/doc/ctdb.7
+++ b/ctdb/doc/ctdb.7
@@ -2,12 +2,12 @@
 .\"     Title: ctdb
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB" "7" "03/06/2019" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB" "7" "03/19/2019" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ctdb/doc/ctdb.conf.5 b/ctdb/doc/ctdb.conf.5
index d122fbd..026c2d6 100644
--- a/ctdb/doc/ctdb.conf.5
+++ b/ctdb/doc/ctdb.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: ctdb.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB\&.CONF" "5" "03/06/2019" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB\&.CONF" "5" "03/19/2019" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ctdb/doc/ctdb.sysconfig.5 b/ctdb/doc/ctdb.sysconfig.5
index 370583b..e204604 100644
--- a/ctdb/doc/ctdb.sysconfig.5
+++ b/ctdb/doc/ctdb.sysconfig.5
@@ -2,12 +2,12 @@
 .\"     Title: ctdb.sysconfig
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB\&.SYSCONFIG" "5" "03/06/2019" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB\&.SYSCONFIG" "5" "03/19/2019" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ctdb/doc/ctdb_diagnostics.1 b/ctdb/doc/ctdb_diagnostics.1
index 5511f91..3e86d7b 100644
--- a/ctdb/doc/ctdb_diagnostics.1
+++ b/ctdb/doc/ctdb_diagnostics.1
@@ -2,12 +2,12 @@
 .\"     Title: ctdb_diagnostics
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB_DIAGNOSTICS" "1" "03/06/2019" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB_DIAGNOSTICS" "1" "03/19/2019" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ctdb/doc/ctdb_mutex_ceph_rados_helper.7 b/ctdb/doc/ctdb_mutex_ceph_rados_helper.7
index c653197..a30c035 100644
--- a/ctdb/doc/ctdb_mutex_ceph_rados_helper.7
+++ b/ctdb/doc/ctdb_mutex_ceph_rados_helper.7
@@ -2,12 +2,12 @@
 .\"     Title: Ceph RADOS Mutex
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CEPH RADOS MUTEX" "7" "03/06/2019" "ctdb" "CTDB \- clustered TDB database"
+.TH "CEPH RADOS MUTEX" "7" "03/19/2019" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ctdb/doc/ctdbd.1 b/ctdb/doc/ctdbd.1
index 11a9aca..f6d27f4 100644
--- a/ctdb/doc/ctdbd.1
+++ b/ctdb/doc/ctdbd.1
@@ -2,12 +2,12 @@
 .\"     Title: ctdbd
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDBD" "1" "03/06/2019" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDBD" "1" "03/19/2019" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ctdb/doc/ctdbd_wrapper.1 b/ctdb/doc/ctdbd_wrapper.1
index e3c1b0e..44f72c8 100644
--- a/ctdb/doc/ctdbd_wrapper.1
+++ b/ctdb/doc/ctdbd_wrapper.1
@@ -2,12 +2,12 @@
 .\"     Title: ctdbd_wrapper
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDBD_WRAPPER" "1" "03/06/2019" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDBD_WRAPPER" "1" "03/19/2019" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ctdb/doc/ltdbtool.1 b/ctdb/doc/ltdbtool.1
index fcf8737..602c716 100644
--- a/ctdb/doc/ltdbtool.1
+++ b/ctdb/doc/ltdbtool.1
@@ -2,12 +2,12 @@
 .\"     Title: ltdbtool
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "LTDBTOOL" "1" "03/06/2019" "ctdb" "CTDB \- clustered TDB database"
+.TH "LTDBTOOL" "1" "03/19/2019" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ctdb/doc/onnode.1 b/ctdb/doc/onnode.1
index 731982c..fdd984e 100644
--- a/ctdb/doc/onnode.1
+++ b/ctdb/doc/onnode.1
@@ -2,12 +2,12 @@
 .\"     Title: onnode
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "ONNODE" "1" "03/06/2019" "ctdb" "CTDB \- clustered TDB database"
+.TH "ONNODE" "1" "03/19/2019" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ctdb/doc/ping_pong.1 b/ctdb/doc/ping_pong.1
index 9dff9ed..3f8ad3c 100644
--- a/ctdb/doc/ping_pong.1
+++ b/ctdb/doc/ping_pong.1
@@ -2,12 +2,12 @@
 .\"     Title: ping_pong
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "PING_PONG" "1" "03/06/2019" "ctdb" "CTDB \- clustered TDB database"
+.TH "PING_PONG" "1" "03/19/2019" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/debian/README.source.md b/debian/README.source.md
index 37fb5fa..d5f0644 100644
--- a/debian/README.source.md
+++ b/debian/README.source.md
@@ -1,7 +1,7 @@
 The packaging is kept in https://salsa.debian.org/samba-team/samba.
 
 The version in unstable is on the `master` branch, with the corresponding
-upstream version in the `upstream_4.9` branch (with `pristine-tar` information
+upstream version in the `upstream_4.10` branch (with `pristine-tar` information
 in the `pristine-tar` branch).
 
 It should be possible to build the package by just running `gbp buildpackage`.
@@ -28,7 +28,7 @@ Merging minor upstream releases
 Importing a new upstream version can be done like this:
 
     # set target version
-    upstream_version=4.9.1
+    upstream_version=4.10.1
     # go to git repo
     cd $GIT_DIR
     # Import upstream
diff --git a/debian/changelog b/debian/changelog
index 25e5cee..495429e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+samba (2:4.10.0+dfsg~ubuntu-0ubuntu1) disco; urgency=medium
+
+  * New upstream version: 4.10.0
+    - d/gbp.conf, d/watch, r/README.source: updated for 4.10
+    - d/control: update cmocka build-depends to >= 1.1.3
+    - d/samba-libs.install: bump passdb minor to 0.27.2
+  * d/p/dlz_bind_zone_update.patch: make b9_has_soa check dc=@ node. Thanks to
+    Michael Saxl <[e-mail]>. (LP: #1820846)
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 21 Mar 2019 14:40:32 -0300
+
 samba (2:4.10.0~rc4+dfsg-0ubuntu1) disco; urgency=medium
 
   * New upstream version 4.10.0rc4 (LP: #1818518):
diff --git a/debian/control b/debian/control
index 4766f53..d9fd63c 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends: bison,
                libbsd-dev,
                libcap-dev [linux-any],
                libcephfs-dev [linux-any],
-               libcmocka-dev (>= 1.1.1),
+               libcmocka-dev (>= 1.1.3),
                libcups2-dev,
                libdbus-1-dev,
                libgnutls28-dev,
diff --git a/debian/gbp.conf b/debian/gbp.conf
index e2d80a4..131869a 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 pristine-tar = True
-upstream-branch = upstream_4.9
+upstream-branch = upstream_4.10
 # don't hardcode the debian branch
 ignore-branch = True
 
diff --git a/debian/patches/dlz_bind_zone_update.patch b/debian/patches/dlz_bind_zone_update.patch
new file mode 100644
index 0000000..7d9d823
--- /dev/null
+++ b/debian/patches/dlz_bind_zone_update.patch
@@ -0,0 +1,47 @@
+From 34456fab62fedc6a938d189c7485f40899b3fbb6 Mon Sep 17 00:00:00 2001
+From: Michael Saxl <[e-mail]>
+Date: Tue, 21 Mar 2019 18:22:38 +0100
+Subject: [PATCH] s4:dlz make b9_has_soa check dc=@ node
+
+the zone node does not hold the dnsRecord values, so for the zone level
+the node dc=@,dc=zonename has to be queried
+
+regression introduced with 28e2a518ff32, BUG: https://bugzilla.samba.org/show_bug.cgi?id=13466
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=13841
+
+Signed-off-by: Michael Saxl <[e-mail]>
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/1820846
+Origin: https://attachments.samba.org/attachment.cgi?id=14972
+Last-Update: 2019-03-21
+
+---
+ source4/dns_server/dlz_bind9.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c
+index 82c72111a00..b46dec6cb35 100644
+--- a/source4/dns_server/dlz_bind9.c
++++ b/source4/dns_server/dlz_bind9.c
+@@ -1276,6 +1276,17 @@ static bool b9_has_soa(struct dlz_bind9_data *state, struct ldb_dn *dn, const ch
+ 		return false;
+ 	}
+ 
++	/*
++	 * The SOA record is alwas stored under DC=@,DC=zonename
++	 * This can probably be removed when dns_common_lookup makes a fallback
++	 * lookup on @ pseudo record
++	 */
++
++	if (!ldb_dn_add_child_fmt(dn,"DC=@")) {
++		talloc_free(tmp_ctx);
++		return false;
++	}
++
+ 	werr = dns_common_lookup(state->samdb, tmp_ctx, dn,
+ 				 &records, &num_records, NULL);
+ 	if (!W_ERROR_IS_OK(werr)) {
+-- 
+2.19.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 5c2e310..34d60ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ usershare.patch
 VERSION.patch
 add-so-version-to-private-libraries
 heimdal-rfc3454.txt
+dlz_bind_zone_update.patch
diff --git a/debian/samba-libs.install b/debian/samba-libs.install
index 60df9a6..278f21f 100755
--- a/debian/samba-libs.install
+++ b/debian/samba-libs.install
@@ -13,7 +13,7 @@ usr/lib/*/libsamba-credentials.so.0*
 usr/lib/*/libsamba-errors.so.*
 usr/lib/*/libsamba-hostconfig.so.*
 usr/lib/*/libsamba-passdb.so.0
-usr/lib/*/libsamba-passdb.so.0.27.1
+usr/lib/*/libsamba-passdb.so.0.27.2
 usr/lib/*/libsamba-policy.cpython-*.so.*
 usr/lib/*/libsamba-util.so.*
 usr/lib/*/libsamdb.so.*
diff --git a/debian/watch b/debian/watch
index 024720d..804d2d9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/tp/~alpha1~tp/;s/alpha/~alpha/;s/beta/~beta/;s/rc/~rc/,dversionmangle=s/\+dfsg\d*$//,pgpsigurlmangle=s/tar\.gz/tar.asc/,decompress" \
-	  https://download.samba.org/pub/samba samba-(4\.9\..*).tar.gz
+	  https://download.samba.org/pub/samba samba-(4\.10\..*).tar.gz
diff --git a/docs/manpages/cifsdd.8 b/docs/manpages/cifsdd.8
index b4aa4f8..3b598ec 100644
--- a/docs/manpages/cifsdd.8
+++ b/docs/manpages/cifsdd.8
@@ -2,12 +2,12 @@
 .\"     Title: cifsdd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "CIFSDD" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "CIFSDD" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/dbwrap_tool.1 b/docs/manpages/dbwrap_tool.1
index 6017ae2..6476b02 100644
--- a/docs/manpages/dbwrap_tool.1
+++ b/docs/manpages/dbwrap_tool.1
@@ -2,12 +2,12 @@
 .\"     Title: dbwrap_tool
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "DBWRAP_TOOL" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "DBWRAP_TOOL" "1" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -301,7 +301,7 @@ dbwrap_tool
 Use with caution!
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBsmbd\fR(8),
diff --git a/docs/manpages/eventlogadm.8 b/docs/manpages/eventlogadm.8
index a3bd05b..4b95cb0 100644
--- a/docs/manpages/eventlogadm.8
+++ b/docs/manpages/eventlogadm.8
@@ -2,12 +2,12 @@
 .\"     Title: eventlogadm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "EVENTLOGADM" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "EVENTLOGADM" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -339,7 +339,7 @@ Filter messages from the system log into an event log:
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/findsmb.1 b/docs/manpages/findsmb.1
index 4f71be8..95f9701 100644
--- a/docs/manpages/findsmb.1
+++ b/docs/manpages/findsmb.1
@@ -2,12 +2,12 @@
 .\"     Title: findsmb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "FINDSMB" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "FINDSMB" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -119,7 +119,7 @@ IP ADDR         NETBIOS NAME   WORKGROUP/OS/VERSION
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBnmbd\fR(8),
diff --git a/docs/manpages/idmap_ad.8 b/docs/manpages/idmap_ad.8
index 6cf4d5f..000c72b 100644
--- a/docs/manpages/idmap_ad.8
+++ b/docs/manpages/idmap_ad.8
@@ -2,12 +2,12 @@
 .\"     Title: idmap_ad
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "IDMAP_AD" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "IDMAP_AD" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_autorid.8 b/docs/manpages/idmap_autorid.8
index bfc7cb2..75f880f 100644
--- a/docs/manpages/idmap_autorid.8
+++ b/docs/manpages/idmap_autorid.8
@@ -2,12 +2,12 @@
 .\"     Title: idmap_autorid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "IDMAP_AUTORID" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "IDMAP_AUTORID" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_hash.8 b/docs/manpages/idmap_hash.8
index 21bbdb2..7fddbd1 100644
--- a/docs/manpages/idmap_hash.8
+++ b/docs/manpages/idmap_hash.8
@@ -2,12 +2,12 @@
 .\"     Title: idmap_hash
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "IDMAP_HASH" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "IDMAP_HASH" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_ldap.8 b/docs/manpages/idmap_ldap.8
index 5ad9e6c..34fa210 100644
--- a/docs/manpages/idmap_ldap.8
+++ b/docs/manpages/idmap_ldap.8
@@ -2,12 +2,12 @@
 .\"     Title: idmap_ldap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "IDMAP_LDAP" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "IDMAP_LDAP" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_nss.8 b/docs/manpages/idmap_nss.8
index 8344933..d1692a2 100644
--- a/docs/manpages/idmap_nss.8
+++ b/docs/manpages/idmap_nss.8
@@ -2,12 +2,12 @@
 .\"     Title: idmap_nss
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "IDMAP_NSS" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "IDMAP_NSS" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_rfc2307.8 b/docs/manpages/idmap_rfc2307.8
index 5cd205e..8d47b01 100644
--- a/docs/manpages/idmap_rfc2307.8
+++ b/docs/manpages/idmap_rfc2307.8
@@ -2,12 +2,12 @@
 .\"     Title: idmap_rfc2307
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "IDMAP_RFC2307" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "IDMAP_RFC2307" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_rid.8 b/docs/manpages/idmap_rid.8
index 35887b1..3285ae5 100644
--- a/docs/manpages/idmap_rid.8
+++ b/docs/manpages/idmap_rid.8
@@ -2,12 +2,12 @@
 .\"     Title: idmap_rid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "IDMAP_RID" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "IDMAP_RID" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_script.8 b/docs/manpages/idmap_script.8
index d95362c..67971e8 100644
--- a/docs/manpages/idmap_script.8
+++ b/docs/manpages/idmap_script.8
@@ -2,12 +2,12 @@
 .\"     Title: idmap_script
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "IDMAP_SCRIPT" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "IDMAP_SCRIPT" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_tdb.8 b/docs/manpages/idmap_tdb.8
index c0c944e..9c61d11 100644
--- a/docs/manpages/idmap_tdb.8
+++ b/docs/manpages/idmap_tdb.8
@@ -2,12 +2,12 @@
 .\"     Title: idmap_tdb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "IDMAP_TDB" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_tdb2.8 b/docs/manpages/idmap_tdb2.8
index 7470ea3..a662b94 100644
--- a/docs/manpages/idmap_tdb2.8
+++ b/docs/manpages/idmap_tdb2.8
@@ -2,12 +2,12 @@
 .\"     Title: idmap_tdb2
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB2" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "IDMAP_TDB2" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/libsmbclient.7 b/docs/manpages/libsmbclient.7
index 6e1c5ef..05944e3 100644
--- a/docs/manpages/libsmbclient.7
+++ b/docs/manpages/libsmbclient.7
@@ -2,12 +2,12 @@
 .\"     Title: libsmbclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: 7
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "LIBSMBCLIENT" "7" "03/06/2019" "Samba 4\&.10\&.0rc4" "7"
+.TH "LIBSMBCLIENT" "7" "03/19/2019" "Samba 4\&.10\&.0" "7"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -86,7 +86,7 @@ parameter was not included in the URL\&.
 Watch this space for future updates\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/lmhosts.5 b/docs/manpages/lmhosts.5
index 8ca0e53..8b6bc8d 100644
--- a/docs/manpages/lmhosts.5
+++ b/docs/manpages/lmhosts.5
@@ -2,12 +2,12 @@
 .\"     Title: lmhosts
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: File Formats and Conventions
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "LMHOSTS" "5" "03/06/2019" "Samba 4\&.10\&.0rc4" "File Formats and Conventions"
+.TH "LMHOSTS" "5" "03/19/2019" "Samba 4\&.10\&.0" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -112,7 +112,7 @@ or
 /usr/local/samba/lib\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBsmbclient\fR(1),
diff --git a/docs/manpages/log2pcap.1 b/docs/manpages/log2pcap.1
index 716f856..1e7fcf7 100644
--- a/docs/manpages/log2pcap.1
+++ b/docs/manpages/log2pcap.1
@@ -2,12 +2,12 @@
 .\"     Title: log2pcap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "LOG2PCAP" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "LOG2PCAP" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -107,7 +107,7 @@ Convert to pcap using text2pcap:
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "BUGS"
 .PP
 Only SMB data is extracted from the samba logs, no LDAP, NetBIOS lookup or other data\&.
diff --git a/docs/manpages/mvxattr.1 b/docs/manpages/mvxattr.1
index a229b58..b31cd93 100644
--- a/docs/manpages/mvxattr.1
+++ b/docs/manpages/mvxattr.1
@@ -2,12 +2,12 @@
 .\"     Title: mvxattr
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "MVXATTR" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "MVXATTR" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -76,7 +76,7 @@ Force overwriting of destination xattr\&.
 .RE
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/net.8 b/docs/manpages/net.8
index 6cd2821..d3a8fd0 100644
--- a/docs/manpages/net.8
+++ b/docs/manpages/net.8
@@ -2,12 +2,12 @@
 .\"     Title: net
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "NET" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "NET" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index 7d19af0..ada0844 100644
--- a/docs/manpages/nmbd.8
+++ b/docs/manpages/nmbd.8
@@ -2,12 +2,12 @@
 .\"     Title: nmbd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "NMBD" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "NMBD" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -278,7 +278,7 @@ The debug log level of nmbd may be raised or lowered using
 (SIGUSR[1|2] signals are no longer used since Samba 2\&.2)\&. This is to allow transient problems to be diagnosed, whilst still running at a normally low log level\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBinetd\fR(8),
diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1
index 8aaf73e..9134957 100644
--- a/docs/manpages/nmblookup.1
+++ b/docs/manpages/nmblookup.1
@@ -2,12 +2,12 @@
 .\"     Title: nmblookup
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "NMBLOOKUP" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "NMBLOOKUP" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -214,7 +214,7 @@ nmblookup \-U samba\&.org \-R \*(AqIRIX#1B\*(Aq
 would query the WINS server samba\&.org for the domain master browser (1B name type) for the IRIX workgroup\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBnmbd\fR(8),
diff --git a/docs/manpages/ntlm_auth.1 b/docs/manpages/ntlm_auth.1
index 1a412f3..ec76c4b 100644
--- a/docs/manpages/ntlm_auth.1
+++ b/docs/manpages/ntlm_auth.1
@@ -2,12 +2,12 @@
 .\"     Title: ntlm_auth
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "NTLM_AUTH" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "NTLM_AUTH" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -421,7 +421,7 @@ If you\*(Aqre experiencing problems with authenticating Internet Explorer runnin
 the Microsoft Knowledge Base article #239869 and follow instructions described there\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/pam_winbind.8 b/docs/manpages/pam_winbind.8
index dcab129..d087f71 100644
--- a/docs/manpages/pam_winbind.8
+++ b/docs/manpages/pam_winbind.8
@@ -2,12 +2,12 @@
 .\"     Title: pam_winbind
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: 8
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "8"
+.TH "PAM_WINBIND" "8" "03/19/2019" "Samba 4\&.10\&.0" "8"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -177,7 +177,7 @@ This is the profile path set in the profile tab in the user settings\&. Normally
 \fBsmb.conf\fR(5)
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of Samba\&.
+This man page is part of version 4\&.10\&.0 of Samba\&.
 .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\&.
diff --git a/docs/manpages/pam_winbind.conf.5 b/docs/manpages/pam_winbind.conf.5
index 05b0fd0..c39ad59 100644
--- a/docs/manpages/pam_winbind.conf.5
+++ b/docs/manpages/pam_winbind.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: pam_winbind.conf
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: 5
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND\&.CONF" "5" "03/06/2019" "Samba 4\&.10\&.0rc4" "5"
+.TH "PAM_WINBIND\&.CONF" "5" "03/19/2019" "Samba 4\&.10\&.0" "5"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -137,7 +137,7 @@ Defines number of days before pam_winbind starts to warn about passwords that ar
 \fBsmb.conf\fR(5)
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of Samba\&.
+This man page is part of version 4\&.10\&.0 of Samba\&.
 .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\&.
diff --git a/docs/manpages/pdbedit.8 b/docs/manpages/pdbedit.8
index 91f24f8..26f0bd0 100644
--- a/docs/manpages/pdbedit.8
+++ b/docs/manpages/pdbedit.8
@@ -2,12 +2,12 @@
 .\"     Title: pdbedit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "PDBEDIT" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "PDBEDIT" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -619,7 +619,7 @@ option "<name>" to value "<value>" from the command line\&. This overrides compi
 This command may be used only by root\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBsmbpasswd\fR(5),
diff --git a/docs/manpages/profiles.1 b/docs/manpages/profiles.1
index 53752a5..aabd60c 100644
--- a/docs/manpages/profiles.1
+++ b/docs/manpages/profiles.1
@@ -2,12 +2,12 @@
 .\"     Title: profiles
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "PROFILES" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "PROFILES" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -112,7 +112,7 @@ Display brief usage message\&.
 .RE
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/rpcclient.1 b/docs/manpages/rpcclient.1
index b450163..684a43b 100644
--- a/docs/manpages/rpcclient.1
+++ b/docs/manpages/rpcclient.1
@@ -2,12 +2,12 @@
 .\"     Title: rpcclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "RPCCLIENT" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "RPCCLIENT" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -803,7 +803,7 @@ and
 that are incompatible for some commands or services\&. Additionally, the developers are sending reports to Microsoft, and problems found or reported to Microsoft are fixed in Service Packs, which may result in incompatibilities\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/samba-regedit.8 b/docs/manpages/samba-regedit.8
index 7d0d381..b7f317e 100644
--- a/docs/manpages/samba-regedit.8
+++ b/docs/manpages/samba-regedit.8
@@ -2,12 +2,12 @@
 .\"     Title: samba-regedit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SAMBA\-REGEDIT" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "SAMBA\-REGEDIT" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -207,7 +207,7 @@ The supplied password is the NT hash\&.
 .RE
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBsmbd\fR(8),
diff --git a/docs/manpages/samba-tool.8 b/docs/manpages/samba-tool.8
index 85514cd..8a5e367 100644
--- a/docs/manpages/samba-tool.8
+++ b/docs/manpages/samba-tool.8
@@ -2,12 +2,12 @@
 .\"     Title: samba-tool
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SAMBA\-TOOL" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "SAMBA\-TOOL" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -696,7 +696,7 @@ because the repsFrom/To objects are not replicated, and it can reveal replicatio
 Gives usage information\&.
 .SH "VERSION"
 .PP
-This man page is complete for version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is complete for version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7
index ce823af..efc8cbe 100644
--- a/docs/manpages/samba.7
+++ b/docs/manpages/samba.7
@@ -2,12 +2,12 @@
 .\"     Title: samba
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: Miscellanea
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SAMBA" "7" "03/06/2019" "Samba 4\&.10\&.0rc4" "Miscellanea"
+.TH "SAMBA" "7" "03/19/2019" "Samba 4\&.10\&.0" "Miscellanea"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -238,7 +238,7 @@ https://lists\&.samba\&.org
 you can find a lot of information in the archives and you can subscribe to the samba list and ask for help or discuss things\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "CONTRIBUTIONS"
 .PP
 If you wish to contribute to the Samba project, then I suggest you join the Samba mailing list at
diff --git a/docs/manpages/samba.8 b/docs/manpages/samba.8
index a42c78e..771aa90 100644
--- a/docs/manpages/samba.8
+++ b/docs/manpages/samba.8
@@ -2,12 +2,12 @@
 .\"     Title: samba
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SAMBA" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "SAMBA" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -239,7 +239,7 @@ The number and nature of diagnostics available depends on the debug level used b
 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 "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBhosts_access\fR(5)
diff --git a/docs/manpages/sharesec.1 b/docs/manpages/sharesec.1
index cbd0479..78e099b 100644
--- a/docs/manpages/sharesec.1
+++ b/docs/manpages/sharesec.1
@@ -2,12 +2,12 @@
 .\"     Title: sharesec
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SHARESEC" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "SHARESEC" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -337,7 +337,7 @@ List all ACEs for
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 539f0b6..b3776b1 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: smb.conf
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: File Formats and Conventions
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SMB\&.CONF" "5" "03/06/2019" "Samba 4\&.10\&.0rc4" "File Formats and Conventions"
+.TH "SMB\&.CONF" "5" "03/19/2019" "Samba 4\&.10\&.0" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -13237,7 +13237,7 @@ and
 special sections make life for an administrator easy, but the various combinations of default attributes can be tricky\&. Take extreme care when designing these sections\&. In particular, ensure that the permissions on spool directories are correct\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBsamba\fR(7),
diff --git a/docs/manpages/smbcacls.1 b/docs/manpages/smbcacls.1
index 2e81056..e593a68 100644
--- a/docs/manpages/smbcacls.1
+++ b/docs/manpages/smbcacls.1
@@ -2,12 +2,12 @@
 .\"     Title: smbcacls
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SMBCACLS" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "SMBCACLS" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -491,7 +491,7 @@ smbcacls
 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 part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 93c27b2..76b34ac 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -2,12 +2,12 @@
 .\"     Title: smbclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SMBCLIENT" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "SMBCLIENT" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1151,7 +1151,7 @@ Most diagnostics issued by the client are logged in a specified log file\&. The 
 The number and nature of diagnostics available depends on the debug level used by the client\&. If you have problems, set the debug level to 3 and peruse the log files\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/smbcontrol.1 b/docs/manpages/smbcontrol.1
index 472fd2a..f4bf761 100644
--- a/docs/manpages/smbcontrol.1
+++ b/docs/manpages/smbcontrol.1
@@ -2,12 +2,12 @@
 .\"     Title: smbcontrol
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SMBCONTROL" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "SMBCONTROL" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -309,7 +309,7 @@ Query the number of smbd child processes\&. This message can only be sent to
 .RE
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBnmbd\fR(8)
diff --git a/docs/manpages/smbcquotas.1 b/docs/manpages/smbcquotas.1
index 43bfd7b..4e7e708 100644
--- a/docs/manpages/smbcquotas.1
+++ b/docs/manpages/smbcquotas.1
@@ -2,12 +2,12 @@
 .\"     Title: smbcquotas
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SMBCQUOTAS" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "SMBCQUOTAS" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -247,7 +247,7 @@ smbcquotas
 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 part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index 5c47b09..1bf67c4 100644
--- a/docs/manpages/smbd.8
+++ b/docs/manpages/smbd.8
@@ -2,12 +2,12 @@
 .\"     Title: smbd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SMBD" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "SMBD" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -252,7 +252,7 @@ parameter\&. When this is set, the following restrictions apply:
 .RE
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "DIAGNOSTICS"
 .PP
 Most diagnostics issued by the server are logged in a specified log file\&. The log file name is specified at compile time, but may be overridden on the command line\&.
diff --git a/docs/manpages/smbget.1 b/docs/manpages/smbget.1
index 2d0c2e0..84e9704 100644
--- a/docs/manpages/smbget.1
+++ b/docs/manpages/smbget.1
@@ -2,12 +2,12 @@
 .\"     Title: smbget
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SMBGET" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "SMBGET" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -189,7 +189,7 @@ smbget \-Rr smb://rhonwyn/
 Permission denied is returned in some cases where the cause of the error is unknown (such as an illegally formatted smb:// url or trying to get a directory without \-R turned on)\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/smbgetrc.5 b/docs/manpages/smbgetrc.5
index 73ca54a..1fcf730 100644
--- a/docs/manpages/smbgetrc.5
+++ b/docs/manpages/smbgetrc.5
@@ -2,12 +2,12 @@
 .\"     Title: smbgetrc
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: File Formats and Conventions
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SMBGETRC" "5" "03/06/2019" "Samba 4\&.10\&.0rc4" "File Formats and Conventions"
+.TH "SMBGETRC" "5" "03/19/2019" "Samba 4\&.10\&.0" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -87,7 +87,7 @@ Number of bytes to put in a block\&.
 .RE
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBsmbget\fR(1)
diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5
index cd591f1..2e05833 100644
--- a/docs/manpages/smbpasswd.5
+++ b/docs/manpages/smbpasswd.5
@@ -2,12 +2,12 @@
 .\"     Title: smbpasswd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: File Formats and Conventions
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "5" "03/06/2019" "Samba 4\&.10\&.0rc4" "File Formats and Conventions"
+.TH "SMBPASSWD" "5" "03/19/2019" "Samba 4\&.10\&.0" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -165,7 +165,7 @@ This field consists of the time the account was last modified\&. It consists of 
 All other colon separated fields are ignored at this time\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBsmbpasswd\fR(8),
diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8
index 03ef951..5aa2d8b 100644
--- a/docs/manpages/smbpasswd.8
+++ b/docs/manpages/smbpasswd.8
@@ -2,12 +2,12 @@
 .\"     Title: smbpasswd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "SMBPASSWD" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -314,7 +314,7 @@ file and neglecting to allow "localhost" access to the smbd\&.
 In addition, the smbpasswd command is only useful if Samba has been set up to use encrypted passwords\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBsmbpasswd\fR(5),
diff --git a/docs/manpages/smbspool.8 b/docs/manpages/smbspool.8
index 31ad9fd..e9acde0 100644
--- a/docs/manpages/smbspool.8
+++ b/docs/manpages/smbspool.8
@@ -2,12 +2,12 @@
 .\"     Title: smbspool
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SMBSPOOL" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "SMBSPOOL" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -173,7 +173,7 @@ The filename argument (argv[6]) contains the name of the file to print\&. If thi
 .RE
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBsmbd\fR(8)
diff --git a/docs/manpages/smbspool_krb5_wrapper.8 b/docs/manpages/smbspool_krb5_wrapper.8
index c957922..c5b6e23 100644
--- a/docs/manpages/smbspool_krb5_wrapper.8
+++ b/docs/manpages/smbspool_krb5_wrapper.8
@@ -2,12 +2,12 @@
 .\"     Title: smbspool_krb5_wrapper
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SMBSPOOL_KRB5_WRAPPE" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "SMBSPOOL_KRB5_WRAPPE" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1
index 37815cf..69066c2 100644
--- a/docs/manpages/smbstatus.1
+++ b/docs/manpages/smbstatus.1
@@ -2,12 +2,12 @@
 .\"     Title: smbstatus
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SMBSTATUS" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "SMBSTATUS" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -154,7 +154,7 @@ causes smbstatus to display numeric UIDs and GIDs instead of resolving them to n
 .RE
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBsmbd\fR(8)
diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1
index 49c0ce0..193334f 100644
--- a/docs/manpages/smbtar.1
+++ b/docs/manpages/smbtar.1
@@ -2,12 +2,12 @@
 .\"     Title: smbtar
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SMBTAR" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "SMBTAR" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -145,7 +145,7 @@ section for the
 command\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBsmbd\fR(8),
diff --git a/docs/manpages/smbtree.1 b/docs/manpages/smbtree.1
index b1dc971..a1b8105 100644
--- a/docs/manpages/smbtree.1
+++ b/docs/manpages/smbtree.1
@@ -2,12 +2,12 @@
 .\"     Title: smbtree
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "SMBTREE" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "SMBTREE" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -191,7 +191,7 @@ Display brief usage message\&.
 .RE
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1
index dca4b63..5d14f63 100644
--- a/docs/manpages/testparm.1
+++ b/docs/manpages/testparm.1
@@ -2,12 +2,12 @@
 .\"     Title: testparm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "TESTPARM" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "TESTPARM" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -169,7 +169,7 @@ This is usually the name of the configuration file used by
 The program will issue a message saying whether the configuration file loaded OK or not\&. This message may be preceded by errors and warnings if the file did not load\&. If the file was loaded OK, the program then dumps all known service details to stdout\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBsmb.conf\fR(5),
diff --git a/docs/manpages/traffic_learner.7 b/docs/manpages/traffic_learner.7
index 6eca0bf..77493de 100644
--- a/docs/manpages/traffic_learner.7
+++ b/docs/manpages/traffic_learner.7
@@ -2,12 +2,12 @@
 .\"     Title: traffic_learner
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "TRAFFIC_LEARNER" "7" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "TRAFFIC_LEARNER" "7" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -115,7 +115,7 @@ There are two special packet types here\&. "wait:3" refers to a temporary pause 
 The other special packet is "\-", which represents the limit of the conversation\&. In the example, this indicates that one observed conversation ended after this particular ngram\&. This special opcode is also used at the beginning of conversations, which are indicated by the ngram "\-\et\-"\&.
 .SH "VERSION"
 .PP
-This man page is complete for version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is complete for version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBtraffic_replay\fR(7)\&.
diff --git a/docs/manpages/traffic_replay.7 b/docs/manpages/traffic_replay.7
index 054361b..51ba944 100644
--- a/docs/manpages/traffic_replay.7
+++ b/docs/manpages/traffic_replay.7
@@ -2,12 +2,12 @@
 .\"     Title: traffic_replay
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "TRAFFIC_REPLAY" "7" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "TRAFFIC_REPLAY" "7" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -355,7 +355,7 @@ traffic_replay traffic\-model\&.txt my\-dc\&.samdom\&.example\&.com \-UAdmin%pas
 The users created by the test will have names like STGU\-0\-xyz\&. The groups generated have names like STGG\-0\-xyz\&.
 .SH "VERSION"
 .PP
-This man page is complete for version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is complete for version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBtraffic_learner\fR(7)\&.
diff --git a/docs/manpages/vfs_acl_tdb.8 b/docs/manpages/vfs_acl_tdb.8
index f750bc8..b319514 100644
--- a/docs/manpages/vfs_acl_tdb.8
+++ b/docs/manpages/vfs_acl_tdb.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_acl_tdb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_ACL_TDB" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_ACL_TDB" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_acl_xattr.8 b/docs/manpages/vfs_acl_xattr.8
index c248d41..73f83d3 100644
--- a/docs/manpages/vfs_acl_xattr.8
+++ b/docs/manpages/vfs_acl_xattr.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_acl_xattr
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_ACL_XATTR" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_ACL_XATTR" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_aio_fork.8 b/docs/manpages/vfs_aio_fork.8
index cdac3cb..2d2a151 100644
--- a/docs/manpages/vfs_aio_fork.8
+++ b/docs/manpages/vfs_aio_fork.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_aio_fork
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_AIO_FORK" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_AIO_FORK" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -62,7 +62,7 @@ Straight forward use:
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_aio_pthread.8 b/docs/manpages/vfs_aio_pthread.8
index 0a2abdc..4faf1c0 100644
--- a/docs/manpages/vfs_aio_pthread.8
+++ b/docs/manpages/vfs_aio_pthread.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_aio_pthread
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_AIO_PTHREAD" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_AIO_PTHREAD" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -75,7 +75,7 @@ The default is \*(Aqno\*(Aq\&.
 .RE
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_audit.8 b/docs/manpages/vfs_audit.8
index 25897a2..37302c5 100644
--- a/docs/manpages/vfs_audit.8
+++ b/docs/manpages/vfs_audit.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_audit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_AUDIT" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_AUDIT" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -112,7 +112,7 @@ Log operations on all shares using the LOCAL1 facility and NOTICE priority:
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_btrfs.8 b/docs/manpages/vfs_btrfs.8
index fac0227..240a27f 100644
--- a/docs/manpages/vfs_btrfs.8
+++ b/docs/manpages/vfs_btrfs.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_btrfs
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_BTRFS" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_BTRFS" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -104,7 +104,7 @@ to Windows Explorer as file / directory "previous versions"\&.
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_cacheprime.8 b/docs/manpages/vfs_cacheprime.8
index 52cc29d..145dddc 100644
--- a/docs/manpages/vfs_cacheprime.8
+++ b/docs/manpages/vfs_cacheprime.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_cacheprime
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_CACHEPRIME" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_CACHEPRIME" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -115,7 +115,7 @@ cacheprime
 is not a substitute for a general\-purpose readahead mechanism\&. It is intended for use only in very specific environments where disk operations must be aligned and sized to known values (as much as that is possible)\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_cap.8 b/docs/manpages/vfs_cap.8
index 8ffea0b..8f362c1 100644
--- a/docs/manpages/vfs_cap.8
+++ b/docs/manpages/vfs_cap.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_cap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_CAP" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_CAP" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -63,7 +63,7 @@ On a system using GNU libiconv, use CAP encoding to support users in the Shift_J
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_catia.8 b/docs/manpages/vfs_catia.8
index 0e2fd7e..20b7854 100644
--- a/docs/manpages/vfs_catia.8
+++ b/docs/manpages/vfs_catia.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_catia
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_CATIA" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_CATIA" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_ceph.8 b/docs/manpages/vfs_ceph.8
index 42029db..4b28adf 100644
--- a/docs/manpages/vfs_ceph.8
+++ b/docs/manpages/vfs_ceph.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_ceph
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_CEPH" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_CEPH" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -94,7 +94,7 @@ Example: ceph:user_id = samba
 .RE
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_commit.8 b/docs/manpages/vfs_commit.8
index 710c377..3d02f2d 100644
--- a/docs/manpages/vfs_commit.8
+++ b/docs/manpages/vfs_commit.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_commit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_COMMIT" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_COMMIT" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -116,7 +116,7 @@ commit
 may reduce performance\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_crossrename.8 b/docs/manpages/vfs_crossrename.8
index 728ee6d..b211511 100644
--- a/docs/manpages/vfs_crossrename.8
+++ b/docs/manpages/vfs_crossrename.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_crossrename
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_CROSSRENAME" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_CROSSRENAME" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -89,7 +89,7 @@ To add server\-side cross\-device renames inside of a share for all files sized 
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_default_quota.8 b/docs/manpages/vfs_default_quota.8
index 54b4d5f..f11aef5 100644
--- a/docs/manpages/vfs_default_quota.8
+++ b/docs/manpages/vfs_default_quota.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_default_quota
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_DEFAULT_QUOTA" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_DEFAULT_QUOTA" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -86,7 +86,7 @@ Store the default quota record in the quota record for the user with ID 65535 an
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_dirsort.8 b/docs/manpages/vfs_dirsort.8
index 66e98c8..69d8332 100644
--- a/docs/manpages/vfs_dirsort.8
+++ b/docs/manpages/vfs_dirsort.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_dirsort
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_DIRSORT" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_DIRSORT" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -59,7 +59,7 @@ Sort directories for all shares:
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_extd_audit.8 b/docs/manpages/vfs_extd_audit.8
index 0443ea8..b930cb4 100644
--- a/docs/manpages/vfs_extd_audit.8
+++ b/docs/manpages/vfs_extd_audit.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_extd_audit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_EXTD_AUDIT" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_EXTD_AUDIT" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -55,7 +55,7 @@ is identical to
 This module is stackable\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_fake_perms.8 b/docs/manpages/vfs_fake_perms.8
index ef248d1..21a055d 100644
--- a/docs/manpages/vfs_fake_perms.8
+++ b/docs/manpages/vfs_fake_perms.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_fake_perms
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_FAKE_PERMS" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_FAKE_PERMS" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -58,7 +58,7 @@ This module is stackable\&.
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_fileid.8 b/docs/manpages/vfs_fileid.8
index cfd2aae..d3e2e5b 100644
--- a/docs/manpages/vfs_fileid.8
+++ b/docs/manpages/vfs_fileid.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_fileid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_FILEID" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_FILEID" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -138,7 +138,7 @@ algorithm:
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_fruit.8 b/docs/manpages/vfs_fruit.8
index 64768b7..308408d 100644
--- a/docs/manpages/vfs_fruit.8
+++ b/docs/manpages/vfs_fruit.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_fruit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_FRUIT" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_FRUIT" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_full_audit.8 b/docs/manpages/vfs_full_audit.8
index 3bdf587..9f17eb4 100644
--- a/docs/manpages/vfs_full_audit.8
+++ b/docs/manpages/vfs_full_audit.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_full_audit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_FULL_AUDIT" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_FULL_AUDIT" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -394,7 +394,7 @@ Log file and directory open operations on the [records] share using the LOCAL7 f
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_glusterfs.8 b/docs/manpages/vfs_glusterfs.8
index 51e6fb1..30e02cc 100644
--- a/docs/manpages/vfs_glusterfs.8
+++ b/docs/manpages/vfs_glusterfs.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_glusterfs
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_GLUSTERFS" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_GLUSTERFS" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -109,7 +109,7 @@ Defines the glusterfs volumename to use for this share\&.
 .RE
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_glusterfs_fuse.8 b/docs/manpages/vfs_glusterfs_fuse.8
index 4ff5f28..4813690 100644
--- a/docs/manpages/vfs_glusterfs_fuse.8
+++ b/docs/manpages/vfs_glusterfs_fuse.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_glusterfs_fuse
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_GLUSTERFS_FUSE" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_GLUSTERFS_FUSE" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -76,7 +76,7 @@ module\&.
 This module does currently have no further options\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_gpfs.8 b/docs/manpages/vfs_gpfs.8
index 81e4650..6fc7879 100644
--- a/docs/manpages/vfs_gpfs.8
+++ b/docs/manpages/vfs_gpfs.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_gpfs
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_GPFS" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_GPFS" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -724,7 +724,7 @@ gpfs\&.h
 in gpfs versions newer than 3\&.2\&.1 PTF8\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_linux_xfs_sgid.8 b/docs/manpages/vfs_linux_xfs_sgid.8
index a5acfde..5822f09 100644
--- a/docs/manpages/vfs_linux_xfs_sgid.8
+++ b/docs/manpages/vfs_linux_xfs_sgid.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_syncops
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_SYNCOPS" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_SYNCOPS" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -64,7 +64,7 @@ Add syncops functionality for [share]:
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_media_harmony.8 b/docs/manpages/vfs_media_harmony.8
index cd93ab2..12a8fd7 100644
--- a/docs/manpages/vfs_media_harmony.8
+++ b/docs/manpages/vfs_media_harmony.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_media_harmony
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_MEDIA_HARMONY" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_MEDIA_HARMONY" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -138,7 +138,7 @@ vfs_media_harmony
 is designed to work with Avid editing applications that look in the Avid MediaFiles or OMFI MediaFiles directories for media\&. It is not designed to work as expected in all circumstances for general use\&. For example: It is possible to open a client\-specific file such as msmMMOB\&.mdb_192\&.168\&.1\&.10_userx even though it doesn\*(Aqt show up in a directory listing\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_netatalk.8 b/docs/manpages/vfs_netatalk.8
index 0628ec8..9a97fbb 100644
--- a/docs/manpages/vfs_netatalk.8
+++ b/docs/manpages/vfs_netatalk.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_netatalk
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_NETATALK" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_NETATALK" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -62,7 +62,7 @@ Hide \&.AppleDouble files on the [data] share:
 This module is largely historic and unlikely to be of use in modern networks since current Apple systems are able to mount CIFS shares natively\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_nfs4acl_xattr.8 b/docs/manpages/vfs_nfs4acl_xattr.8
index f4f4b86..2d5118d 100644
--- a/docs/manpages/vfs_nfs4acl_xattr.8
+++ b/docs/manpages/vfs_nfs4acl_xattr.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_nfs4acl_xattr
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_NFS4ACL_XATTR" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_NFS4ACL_XATTR" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_offline.8 b/docs/manpages/vfs_offline.8
index 478220a..b5c9f7c 100644
--- a/docs/manpages/vfs_offline.8
+++ b/docs/manpages/vfs_offline.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_offline
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_OFFLINE" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_OFFLINE" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -59,7 +59,7 @@ Mark all files in a share as offline:
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_prealloc.8 b/docs/manpages/vfs_prealloc.8
index 462bf4b..a25ebcc 100644
--- a/docs/manpages/vfs_prealloc.8
+++ b/docs/manpages/vfs_prealloc.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_prealloc
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_PREALLOC" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_PREALLOC" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -112,7 +112,7 @@ vfs_prealloc
 is not supported on all platforms and filesystems\&. Currently only XFS filesystems on Linux and IRIX are supported\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_preopen.8 b/docs/manpages/vfs_preopen.8
index 4bf0952..2479cb5 100644
--- a/docs/manpages/vfs_preopen.8
+++ b/docs/manpages/vfs_preopen.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_preopen
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_PREOPEN" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_PREOPEN" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -67,7 +67,7 @@ Number of files that should be speculatively opened\&. Defaults to the 10 subseq
 .RE
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_readahead.8 b/docs/manpages/vfs_readahead.8
index 13105c7..04791fa 100644
--- a/docs/manpages/vfs_readahead.8
+++ b/docs/manpages/vfs_readahead.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_readahead
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_READAHEAD" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_READAHEAD" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -115,7 +115,7 @@ G
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_readonly.8 b/docs/manpages/vfs_readonly.8
index ae6ad68..b1da782 100644
--- a/docs/manpages/vfs_readonly.8
+++ b/docs/manpages/vfs_readonly.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_readonly
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_READONLY" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_READONLY" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -81,7 +81,7 @@ Mark the [backup] share as read only during business hours:
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_recycle.8 b/docs/manpages/vfs_recycle.8
index 42e426e..96f7bb0 100644
--- a/docs/manpages/vfs_recycle.8
+++ b/docs/manpages/vfs_recycle.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_recycle
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_RECYCLE" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_RECYCLE" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -136,7 +136,7 @@ instead of deleting them:
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_shadow_copy.8 b/docs/manpages/vfs_shadow_copy.8
index 62a55bb..9b903bb 100644
--- a/docs/manpages/vfs_shadow_copy.8
+++ b/docs/manpages/vfs_shadow_copy.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_shadow_copy
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_SHADOW_COPY" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -167,7 +167,7 @@ vfs_shadow_copy
 is designed to be an end\-user tool only\&. It does not replace or enhance your backup and archival solutions and should in no way be considered as such\&. Additionally, if you need version control, implement a version control system\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_shadow_copy2.8 b/docs/manpages/vfs_shadow_copy2.8
index 2bebf1e..90c0e72 100644
--- a/docs/manpages/vfs_shadow_copy2.8
+++ b/docs/manpages/vfs_shadow_copy2.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_shadow_copy2
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY2" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_SHADOW_COPY2" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -519,7 +519,7 @@ vfs_shadow_copy2
 is designed to be an end\-user tool only\&. It does not replace or enhance your backup and archival solutions and should in no way be considered as such\&. Additionally, if you need version control, implement a version control system\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_shell_snap.8 b/docs/manpages/vfs_shell_snap.8
index 18cfb3a..2a5d4c5 100644
--- a/docs/manpages/vfs_shell_snap.8
+++ b/docs/manpages/vfs_shell_snap.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_shell_snap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_SHELL_SNAP" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_SHELL_SNAP" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -215,7 +215,7 @@ Samba\*(Aqs FSRVP server must be configured in the [global] section:
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_snapper.8 b/docs/manpages/vfs_snapper.8
index 18ba13a..fdd3b5f 100644
--- a/docs/manpages/vfs_snapper.8
+++ b/docs/manpages/vfs_snapper.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_snapper
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_SNAPPER" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_SNAPPER" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -85,7 +85,7 @@ Remote snapshot creation and deletion is only permitted by Samba for Active Dire
 The DiskShadow\&.exe FSRVP client initially authenticates as the Active Directory computer account\&. This account must therefore be granted the same permissions as the user account issuing the snapshot creation and deletion requests\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_streams_depot.8 b/docs/manpages/vfs_streams_depot.8
index 3d818dd..a7a8ce2 100644
--- a/docs/manpages/vfs_streams_depot.8
+++ b/docs/manpages/vfs_streams_depot.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_streams_depot
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_DEPOT" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_STREAMS_DEPOT" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_streams_xattr.8 b/docs/manpages/vfs_streams_xattr.8
index 7489d2d..3b8e7f2 100644
--- a/docs/manpages/vfs_streams_xattr.8
+++ b/docs/manpages/vfs_streams_xattr.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_streams_xattr
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_XATTR" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_STREAMS_XATTR" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_syncops.8 b/docs/manpages/vfs_syncops.8
index 91750e4..84ce4ed 100644
--- a/docs/manpages/vfs_syncops.8
+++ b/docs/manpages/vfs_syncops.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_syncops
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_SYNCOPS" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_SYNCOPS" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -76,7 +76,7 @@ Add syncops functionality for [share]:
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_time_audit.8 b/docs/manpages/vfs_time_audit.8
index e28ca72..1d117d8 100644
--- a/docs/manpages/vfs_time_audit.8
+++ b/docs/manpages/vfs_time_audit.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_time_audit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_TIME_AUDIT" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_TIME_AUDIT" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -72,7 +72,7 @@ This would log VFS calls that take longer than 3 seconds:
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_tsmsm.8 b/docs/manpages/vfs_tsmsm.8
index 2e6faa2..0984def 100644
--- a/docs/manpages/vfs_tsmsm.8
+++ b/docs/manpages/vfs_tsmsm.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_tsmsm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_TSMSM" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_TSMSM" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -83,7 +83,7 @@ A GPFS mount with TSM support can be exported via Samba as follows:
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_unityed_media.8 b/docs/manpages/vfs_unityed_media.8
index cea8490..3035cd6 100644
--- a/docs/manpages/vfs_unityed_media.8
+++ b/docs/manpages/vfs_unityed_media.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_unityed_media
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_UNITYED_MEDIA" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_UNITYED_MEDIA" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -111,7 +111,7 @@ Enable unityed_media for Mac and Windows clients:
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_virusfilter.8 b/docs/manpages/vfs_virusfilter.8
index b13c21b..d43715d 100644
--- a/docs/manpages/vfs_virusfilter.8
+++ b/docs/manpages/vfs_virusfilter.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_virusfilter
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
 .\"    Source: Samba 4.8
 .\"  Language: English
 .\"
-.TH "VFS_VIRUSFILTER" "8" "03/06/2019" "Samba 4\&.8" "System Administration tools"
+.TH "VFS_VIRUSFILTER" "8" "03/19/2019" "Samba 4\&.8" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_worm.8 b/docs/manpages/vfs_worm.8
index bbd17d5..a71759e 100644
--- a/docs/manpages/vfs_worm.8
+++ b/docs/manpages/vfs_worm.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_worm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_WORM" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_WORM" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -68,7 +68,7 @@ Deny the write access to files and folders, which are older than five minutes (3
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfs_xattr_tdb.8 b/docs/manpages/vfs_xattr_tdb.8
index 45d77be..253871a 100644
--- a/docs/manpages/vfs_xattr_tdb.8
+++ b/docs/manpages/vfs_xattr_tdb.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_xattr_tdb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_XATTR_TDB" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_XATTR_TDB" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_zfsacl.8 b/docs/manpages/vfs_zfsacl.8
index 6ff7a65..94ae90b 100644
--- a/docs/manpages/vfs_zfsacl.8
+++ b/docs/manpages/vfs_zfsacl.8
@@ -2,12 +2,12 @@
 .\"     Title: vfs_zfsacl
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFS_ZFSACL" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "VFS_ZFSACL" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -215,7 +215,7 @@ A ZFS mount can be exported via Samba as follows :
 .\}
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/vfstest.1 b/docs/manpages/vfstest.1
index 8f0157f..7fe946b 100644
--- a/docs/manpages/vfstest.1
+++ b/docs/manpages/vfstest.1
@@ -2,12 +2,12 @@
 .\"     Title: vfstest
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "VFSTEST" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "VFSTEST" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -783,7 +783,7 @@ exit
 .RE
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1
index a2a5742..d2005df 100644
--- a/docs/manpages/wbinfo.1
+++ b/docs/manpages/wbinfo.1
@@ -2,12 +2,12 @@
 .\"     Title: wbinfo
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: User Commands
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "WBINFO" "1" "03/06/2019" "Samba 4\&.10\&.0rc4" "User Commands"
+.TH "WBINFO" "1" "03/19/2019" "Samba 4\&.10\&.0" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -467,7 +467,7 @@ wbinfo
 will always return failure\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 \fBwinbindd\fR(8)
diff --git a/docs/manpages/winbind_krb5_localauth.8 b/docs/manpages/winbind_krb5_localauth.8
index 3800f88..dfd540a 100644
--- a/docs/manpages/winbind_krb5_localauth.8
+++ b/docs/manpages/winbind_krb5_localauth.8
@@ -2,12 +2,12 @@
 .\"     Title: winbind_krb5_localauth
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: 8
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "WINBIND_KRB5_LOCALAU" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "8"
+.TH "WINBIND_KRB5_LOCALAU" "8" "03/19/2019" "Samba 4\&.10\&.0" "8"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -66,7 +66,7 @@ file\&.
 .sp
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/winbind_krb5_locator.8 b/docs/manpages/winbind_krb5_locator.8
index b3c4cce..2cb52a8 100644
--- a/docs/manpages/winbind_krb5_locator.8
+++ b/docs/manpages/winbind_krb5_locator.8
@@ -2,12 +2,12 @@
 .\"     Title: winbind_krb5_locator
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: 8
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "WINBIND_KRB5_LOCATOR" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "8"
+.TH "WINBIND_KRB5_LOCATOR" "8" "03/19/2019" "Samba 4\&.10\&.0" "8"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -57,7 +57,7 @@ After copying the locator plugin to the appropriate plugin directory it should i
 /etc/krb5\&.conf\&.
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 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\&.
diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8
index b40e1a3..941dd55 100644
--- a/docs/manpages/winbindd.8
+++ b/docs/manpages/winbindd.8
@@ -2,12 +2,12 @@
 .\"     Title: winbindd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/06/2019
+.\"      Date: 03/19/2019
 .\"    Manual: System Administration tools
-.\"    Source: Samba 4.10.0rc4
+.\"    Source: Samba 4.10.0
 .\"  Language: English
 .\"
-.TH "WINBINDD" "8" "03/06/2019" "Samba 4\&.10\&.0rc4" "System Administration tools"
+.TH "WINBINDD" "8" "03/19/2019" "Samba 4\&.10\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -579,7 +579,7 @@ Storage for cached user and group information\&.
 .RE
 .SH "VERSION"
 .PP
-This man page is part of version 4\&.10\&.0rc4 of the Samba suite\&.
+This man page is part of version 4\&.10\&.0 of the Samba suite\&.
 .SH "SEE ALSO"
 .PP
 nsswitch\&.conf(5),
diff --git a/lib/util/util.c b/lib/util/util.c
index f52f69c..dc1772c 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -200,9 +200,9 @@ _PUBLIC_ bool directory_create_or_exist(const char *dname,
 	old_umask = umask(0);
 	ret = mkdir(dname, dir_perms);
 	if (ret == -1 && errno != EEXIST) {
-		DEBUG(0, ("mkdir failed on directory "
-			  "%s: %s\n", dname,
-			  strerror(errno)));
+		DBG_WARNING("mkdir failed on directory %s: %s\n",
+			    dname,
+			    strerror(errno));
 		umask(old_umask);
 		return false;
 	}
diff --git a/libcli/security/access_check.c b/libcli/security/access_check.c
index 03a7dca..322f4fd 100644
--- a/libcli/security/access_check.c
+++ b/libcli/security/access_check.c
@@ -109,24 +109,61 @@ static uint32_t access_check_max_allowed(const struct security_descriptor *sd,
 					const struct security_token *token)
 {
 	uint32_t denied = 0, granted = 0;
+	bool am_owner = false;
+	bool have_owner_rights_ace = false;
 	unsigned i;
 
+	if (sd->dacl == NULL) {
+		if (security_token_has_sid(token, sd->owner_sid)) {
+			granted |= SEC_STD_WRITE_DAC | SEC_STD_READ_CONTROL;
+		}
+		return granted;
+	}
+
 	if (security_token_has_sid(token, sd->owner_sid)) {
-		granted |= SEC_STD_WRITE_DAC | SEC_STD_READ_CONTROL;
+		/*
+		 * Check for explicit owner rights: if there are none, we remove
+		 * the default owner right SEC_STD_WRITE_DAC|SEC_STD_READ_CONTROL
+		 * from remaining_access. Otherwise we just process the
+		 * explicitly granted rights when processing the ACEs.
+		 */
+		am_owner = true;
+
+		for (i=0; i < sd->dacl->num_aces; i++) {
+			struct security_ace *ace = &sd->dacl->aces[i];
+
+			if (ace->flags & SEC_ACE_FLAG_INHERIT_ONLY) {
+				continue;
+			}
+
+			have_owner_rights_ace = dom_sid_equal(
+				&ace->trustee, &global_sid_Owner_Rights);
+			if (have_owner_rights_ace) {
+				break;
+			}
+		}
 	}
 
-	if (sd->dacl == NULL) {
-		return granted & ~denied;
+	if (am_owner && !have_owner_rights_ace) {
+		granted |= SEC_STD_WRITE_DAC|SEC_STD_READ_CONTROL;
 	}
 
 	for (i = 0;i<sd->dacl->num_aces; i++) {
 		struct security_ace *ace = &sd->dacl->aces[i];
+		bool is_owner_rights_ace = false;
 
 		if (ace->flags & SEC_ACE_FLAG_INHERIT_ONLY) {
 			continue;
 		}
 
-		if (!security_token_has_sid(token, &ace->trustee)) {
+		if (am_owner) {
+			is_owner_rights_ace = dom_sid_equal(
+				&ace->trustee, &global_sid_Owner_Rights);
+		}
+
+		if (!is_owner_rights_ace &&
+		    !security_token_has_sid(token, &ace->trustee))
+		{
 			continue;
 		}
 
@@ -136,7 +173,7 @@ static uint32_t access_check_max_allowed(const struct security_descriptor *sd,
 			break;
 		case SEC_ACE_TYPE_ACCESS_DENIED:
 		case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT:
-			denied |= ace->access_mask;
+			denied |= ~granted & ace->access_mask;
 			break;
 		default:	/* Other ACE types not handled/supported */
 			break;
@@ -159,16 +196,8 @@ NTSTATUS se_access_check(const struct security_descriptor *sd,
 	uint32_t i;
 	uint32_t bits_remaining;
 	uint32_t explicitly_denied_bits = 0;
-	/*
-	 * Up until Windows Server 2008, owner always had these rights. Now
-	 * we have to use Owner Rights perms if they are on the file.
-	 *
-	 * In addition we have to accumulate these bits and apply them
-	 * correctly. See bug #8795
-	 */
-	uint32_t owner_rights_allowed = 0;
-	uint32_t owner_rights_denied = 0;
-	bool owner_rights_default = true;
+	bool am_owner = false;
+	bool have_owner_rights_ace = false;
 
 	*access_granted = access_desired;
 	bits_remaining = access_desired;
@@ -198,35 +227,50 @@ NTSTATUS se_access_check(const struct security_descriptor *sd,
 		goto done;
 	}
 
+	if (security_token_has_sid(token, sd->owner_sid)) {
+		/*
+		 * Check for explicit owner rights: if there are none, we remove
+		 * the default owner right SEC_STD_WRITE_DAC|SEC_STD_READ_CONTROL
+		 * from remaining_access. Otherwise we just process the
+		 * explicitly granted rights when processing the ACEs.
+		 */
+		am_owner = true;
+
+		for (i=0; i < sd->dacl->num_aces; i++) {
+			struct security_ace *ace = &sd->dacl->aces[i];
+
+			if (ace->flags & SEC_ACE_FLAG_INHERIT_ONLY) {
+				continue;
+			}
+
+			have_owner_rights_ace = dom_sid_equal(
+				&ace->trustee, &global_sid_Owner_Rights);
+			if (have_owner_rights_ace) {
+				break;
+			}
+		}
+	}
+	if (am_owner && !have_owner_rights_ace) {
+		bits_remaining &= ~(SEC_STD_WRITE_DAC | SEC_STD_READ_CONTROL);
+	}
+
 	/* check each ace in turn. */
 	for (i=0; bits_remaining && i < sd->dacl->num_aces; i++) {
 		struct security_ace *ace = &sd->dacl->aces[i];
+		bool is_owner_rights_ace = false;
 
 		if (ace->flags & SEC_ACE_FLAG_INHERIT_ONLY) {
 			continue;
 		}
 
-		/*
-		 * We need the Owner Rights permissions to ensure we
-		 * give or deny the correct permissions to the owner. Replace
-		 * owner_rights with the perms here if it is present.
-		 *
-		 * We don't care if we are not the owner because that is taken
-		 * care of below when we check if our token has the owner SID.
-		 *
-		 */
-		if (dom_sid_equal(&ace->trustee, &global_sid_Owner_Rights)) {
-			if (ace->type == SEC_ACE_TYPE_ACCESS_ALLOWED) {
-				owner_rights_allowed |= ace->access_mask;
-				owner_rights_default = false;
-			} else if (ace->type == SEC_ACE_TYPE_ACCESS_DENIED) {
-				owner_rights_denied |= (bits_remaining & ace->access_mask);
-				owner_rights_default = false;
-			}
-			continue;
+		if (am_owner) {
+			is_owner_rights_ace = dom_sid_equal(
+				&ace->trustee, &global_sid_Owner_Rights);
 		}
 
-		if (!security_token_has_sid(token, &ace->trustee)) {
+		if (!is_owner_rights_ace &&
+		    !security_token_has_sid(token, &ace->trustee))
+		{
 			continue;
 		}
 
@@ -246,21 +290,6 @@ NTSTATUS se_access_check(const struct security_descriptor *sd,
 	/* Explicitly denied bits always override */
 	bits_remaining |= explicitly_denied_bits;
 
-	/* The owner always gets owner rights as defined above. */
-	if (security_token_has_sid(token, sd->owner_sid)) {
-		if (owner_rights_default) {
-			/*
-			 * Just remove them, no need to check if they are
-			 * there.
-			 */
-			bits_remaining &= ~(SEC_STD_WRITE_DAC |
-						SEC_STD_READ_CONTROL);
-		} else {
-			bits_remaining &= ~owner_rights_allowed;
-			bits_remaining |= owner_rights_denied;
-		}
-	}
-
 	/*
 	 * We check privileges here because they override even DENY entries.
 	 */
diff --git a/script/autobuild.py b/script/autobuild.py
index 2ea9e55..67c18a1 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -51,6 +51,8 @@ builddirs = {
     "samba-ad-dc-py2": ".",
     "samba-ad-dc-2": ".",
     "samba-ad-dc-2-py2": ".",
+    "samba-ad-dc-backup": ".",
+    "samba-ad-dc-backup-py2": ".",
     "samba-systemkrb5": ".",
     "samba-nopython": ".",
     "samba-buildpy2-only": ".",
@@ -166,6 +168,17 @@ tasks = {
                          "--include-env=vampire_2000_dc "
                          "--include-env=fl2000dc "
                          "--include-env=ad_dc_no_nss "
+                         "'",
+                         "text/plain"),
+                        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
+    # run the backup/restore testenvs separately as they're fairly standalone
+    # (and CI seems to max out at ~8 different DCs running at once)
+    "samba-ad-dc-backup": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+                        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+                        ("make", "make -j", "text/plain"),
+                        ("test", "make test FAIL_IMMEDIATELY=1 "
+                         "TESTS='${PY3_ONLY}"
                          "--include-env=backupfromdc "
                          "--include-env=restoredc "
                          "--include-env=renamedc "
diff --git a/source3/lib/idmap_cache.c b/source3/lib/idmap_cache.c
index 77618dd..9d21498 100644
--- a/source3/lib/idmap_cache.c
+++ b/source3/lib/idmap_cache.c
@@ -203,19 +203,23 @@ static void idmap_cache_xid2sid_parser(const struct gencache_timeout *timeout,
 		(struct idmap_cache_xid2sid_state *)private_data;
 	char *value;
 
-	ZERO_STRUCTP(state->sid);
-	state->ret = false;
-
 	if ((blob.length == 0) || (blob.data[blob.length-1] != 0)) {
 		/*
 		 * Not a string, can't be a valid mapping
 		 */
+		state->ret = false;
 		return;
 	}
 
 	value = (char *)blob.data;
 
-	if (value[0] != '-') {
+	if ((value[0] == '-') && (value[1] == '\0')) {
+		/*
+		 * Return NULL SID, see comment to uid2sid
+		 */
+		*state->sid = (struct dom_sid) {0};
+		state->ret = true;
+	} else {
 		state->ret = string_to_sid(state->sid, value);
 	}
 	if (state->ret) {
@@ -274,6 +278,42 @@ bool idmap_cache_find_gid2sid(gid_t gid, struct dom_sid *sid, bool *expired)
 }
 
 /**
+ * Find a xid2sid mapping
+ * @param[in] id		the unix id to map
+ * @param[out] sid		where to put the result
+ * @param[out] expired		is the cache entry expired?
+ * @retval Was anything in the cache at all?
+ *
+ * If "is_null_sid(sid)", this was a negative mapping.
+ */
+bool idmap_cache_find_xid2sid(
+	const struct unixid *id, struct dom_sid *sid, bool *expired)
+{
+	struct idmap_cache_xid2sid_state state = {
+		.sid = sid, .expired = expired
+	};
+	fstring key;
+	char c;
+
+	switch (id->type) {
+	case ID_TYPE_UID:
+		c = 'U';
+		break;
+	case ID_TYPE_GID:
+		c = 'G';
+		break;
+	default:
+		return false;
+	}
+
+	fstr_sprintf(key, "IDMAP/%cID2SID/%d", c, (int)id->id);
+
+	gencache_parse(key, idmap_cache_xid2sid_parser, &state);
+	return state.ret;
+}
+
+
+/**
  * Store a mapping in the idmap cache
  * @param[in] sid		the sid to map
  * @param[in] unix_id		the unix_id to map
diff --git a/source3/lib/idmap_cache.h b/source3/lib/idmap_cache.h
index dc49702..d5afa17 100644
--- a/source3/lib/idmap_cache.h
+++ b/source3/lib/idmap_cache.h
@@ -31,6 +31,8 @@ bool idmap_cache_find_sid2gid(const struct dom_sid *sid, gid_t *pgid,
 			      bool *expired);
 bool idmap_cache_find_uid2sid(uid_t uid, struct dom_sid *sid, bool *expired);
 bool idmap_cache_find_gid2sid(gid_t gid, struct dom_sid *sid, bool *expired);
+bool idmap_cache_find_xid2sid(
+	const struct unixid *id, struct dom_sid *sid, bool *expired);
 void idmap_cache_set_sid2unixid(const struct dom_sid *sid, struct unixid *unix_id);
 
 bool idmap_cache_del_uid(uid_t uid);
diff --git a/source3/lib/winbind_util.c b/source3/lib/winbind_util.c
index a072166..0c1f2c2 100644
--- a/source3/lib/winbind_util.c
+++ b/source3/lib/winbind_util.c
@@ -23,10 +23,10 @@
 #include "../lib/util/util_pw.h"
 #include "nsswitch/libwbclient/wbclient.h"
 
-#if defined(WITH_WINBIND)
-
 #include "lib/winbind_util.h"
 
+#if defined(WITH_WINBIND)
+
 struct passwd * winbind_getpwnam(const char * name)
 {
 	wbcErr result;
@@ -198,6 +198,36 @@ bool winbind_gid_to_sid(struct dom_sid *sid, gid_t gid)
 	return (result == WBC_ERR_SUCCESS);
 }
 
+bool winbind_xid_to_sid(struct dom_sid *sid, const struct unixid *xid)
+{
+	struct wbcUnixId wbc_xid;
+	struct wbcDomainSid dom_sid;
+	wbcErr result;
+
+	switch (xid->type) {
+	case ID_TYPE_UID:
+		wbc_xid = (struct wbcUnixId) {
+			.type = WBC_ID_TYPE_UID, .id.uid = xid->id
+		};
+		break;
+	case ID_TYPE_GID:
+		wbc_xid = (struct wbcUnixId) {
+			.type = WBC_ID_TYPE_GID, .id.gid = xid->id
+		};
+		break;
+	default:
+		return false;
+	}
+
+	result = wbcUnixIdsToSids(&wbc_xid, 1, &dom_sid);
+	if (result != WBC_ERR_SUCCESS) {
+		return false;
+	}
+
+	memcpy(sid, &dom_sid, sizeof(struct dom_sid));
+	return true;
+}
+
 /* Check for a trusted domain */
 
 wbcErr wb_is_trusted_domain(const char *domain)
@@ -371,6 +401,13 @@ bool winbind_gid_to_sid(struct dom_sid *sid, gid_t gid)
 	return false;
 }
 
+/* Call winbindd to convert uid or gid to SID */
+
+bool winbind_xid_to_sid(struct dom_sid *sid, const struct unixid *xid)
+{
+	return false;
+}
+
 /* Check for a trusted domain */
 
 wbcErr wb_is_trusted_domain(const char *domain)
diff --git a/source3/lib/winbind_util.h b/source3/lib/winbind_util.h
index c2bf0e0..5ecda5a 100644
--- a/source3/lib/winbind_util.h
+++ b/source3/lib/winbind_util.h
@@ -22,6 +22,7 @@
 #define __LIB__WINBIND_UTIL_H__
 
 #include "../librpc/gen_ndr/lsa.h"
+#include "librpc/gen_ndr/idmap.h"
 
 /* needed for wbcErr below */
 #include "nsswitch/libwbclient/wbclient.h"
@@ -38,6 +39,7 @@ bool winbind_sid_to_uid(uid_t *puid, const struct dom_sid *sid);
 bool winbind_uid_to_sid(struct dom_sid *sid, uid_t uid);
 bool winbind_sid_to_gid(gid_t *pgid, const struct dom_sid *sid);
 bool winbind_gid_to_sid(struct dom_sid *sid, gid_t gid);
+bool winbind_xid_to_sid(struct dom_sid *sid, const struct unixid *xid);
 struct passwd * winbind_getpwnam(const char * sname);
 struct passwd * winbind_getpwsid(const struct dom_sid *sid);
 wbcErr wb_is_trusted_domain(const char *domain);
diff --git a/source3/passdb/ABI/samba-passdb-0.27.2.sigs b/source3/passdb/ABI/samba-passdb-0.27.2.sigs
new file mode 100644
index 0000000..17876ab
--- /dev/null
+++ b/source3/passdb/ABI/samba-passdb-0.27.2.sigs
@@ -0,0 +1,311 @@
+PDB_secrets_clear_domain_protection: bool (const char *)
+PDB_secrets_fetch_domain_guid: bool (const char *, struct GUID *)
+PDB_secrets_fetch_domain_sid: bool (const char *, struct dom_sid *)
+PDB_secrets_mark_domain_protected: bool (const char *)
+PDB_secrets_store_domain_guid: bool (const char *, struct GUID *)
+PDB_secrets_store_domain_sid: bool (const char *, const struct dom_sid *)
+account_policy_get: bool (enum pdb_policy_type, uint32_t *)
+account_policy_get_default: bool (enum pdb_policy_type, uint32_t *)
+account_policy_get_desc: const char *(enum pdb_policy_type)
+account_policy_name_to_typenum: enum pdb_policy_type (const char *)
+account_policy_names_list: void (TALLOC_CTX *, const char ***, int *)
+account_policy_set: bool (enum pdb_policy_type, uint32_t)
+add_initial_entry: NTSTATUS (gid_t, const char *, enum lsa_SidType, const char *, const char *)
+algorithmic_pdb_gid_to_group_rid: uint32_t (gid_t)
+algorithmic_pdb_rid_is_user: bool (uint32_t)
+algorithmic_pdb_uid_to_user_rid: uint32_t (uid_t)
+algorithmic_pdb_user_rid_to_uid: uid_t (uint32_t)
+algorithmic_rid_base: int (void)
+builtin_domain_name: const char *(void)
+cache_account_policy_get: bool (enum pdb_policy_type, uint32_t *)
+cache_account_policy_set: bool (enum pdb_policy_type, uint32_t)
+create_builtin_administrators: NTSTATUS (const struct dom_sid *)
+create_builtin_guests: NTSTATUS (const struct dom_sid *)
+create_builtin_users: NTSTATUS (const struct dom_sid *)
+decode_account_policy_name: const char *(enum pdb_policy_type)
+get_account_pol_db: struct db_context *(void)
+get_account_policy_attr: const char *(enum pdb_policy_type)
+get_domain_group_from_sid: bool (struct dom_sid, GROUP_MAP *)
+get_primary_group_sid: NTSTATUS (TALLOC_CTX *, const char *, struct passwd **, struct dom_sid **)
+get_privileges_for_sid_as_set: NTSTATUS (TALLOC_CTX *, PRIVILEGE_SET **, struct dom_sid *)
+get_privileges_for_sids: bool (uint64_t *, struct dom_sid *, int)
+get_trust_pw_clear: bool (const char *, char **, const char **, enum netr_SchannelType *)
+get_trust_pw_hash: bool (const char *, uint8_t *, const char **, enum netr_SchannelType *)
+gid_to_sid: void (struct dom_sid *, gid_t)
+gid_to_unix_groups_sid: void (gid_t, struct dom_sid *)
+grab_named_mutex: struct named_mutex *(TALLOC_CTX *, const char *, int)
+grant_all_privileges: bool (const struct dom_sid *)
+grant_privilege_by_name: bool (const struct dom_sid *, const char *)
+grant_privilege_set: bool (const struct dom_sid *, struct lsa_PrivilegeSet *)
+groupdb_tdb_init: const struct mapping_backend *(void)
+init_account_policy: bool (void)
+init_buffer_from_samu: uint32_t (uint8_t **, struct samu *, bool)
+init_samu_from_buffer: bool (struct samu *, uint32_t, uint8_t *, uint32_t)
+initialize_password_db: bool (bool, struct tevent_context *)
+is_dc_trusted_domain_situation: bool (const char *)
+is_privileged_sid: bool (const struct dom_sid *)
+local_password_change: NTSTATUS (const char *, int, const char *, char **, char **)
+login_cache_delentry: bool (const struct samu *)
+login_cache_init: bool (void)
+login_cache_read: bool (struct samu *, struct login_cache *)
+login_cache_shutdown: bool (void)
+login_cache_write: bool (const struct samu *, const struct login_cache *)
+lookup_builtin_name: bool (const char *, uint32_t *)
+lookup_builtin_rid: bool (TALLOC_CTX *, uint32_t, const char **)
+lookup_global_sam_name: bool (const char *, int, uint32_t *, enum lsa_SidType *)
+lookup_name: bool (TALLOC_CTX *, const char *, int, const char **, const char **, struct dom_sid *, enum lsa_SidType *)
+lookup_name_smbconf: bool (TALLOC_CTX *, const char *, int, const char **, const char **, struct dom_sid *, enum lsa_SidType *)
+lookup_sid: bool (TALLOC_CTX *, const struct dom_sid *, const char **, const char **, enum lsa_SidType *)
+lookup_sids: NTSTATUS (TALLOC_CTX *, int, const struct dom_sid **, int, struct lsa_dom_info **, struct lsa_name_info **)
+lookup_wellknown_name: bool (TALLOC_CTX *, const char *, struct dom_sid *, const char **)
+lookup_wellknown_sid: bool (TALLOC_CTX *, const struct dom_sid *, const char **, const char **)
+make_pdb_method: NTSTATUS (struct pdb_methods **)
+make_pdb_method_name: NTSTATUS (struct pdb_methods **, const char *)
+max_algorithmic_gid: gid_t (void)
+max_algorithmic_uid: uid_t (void)
+pdb_add_aliasmem: NTSTATUS (const struct dom_sid *, const struct dom_sid *)
+pdb_add_group_mapping_entry: NTSTATUS (GROUP_MAP *)
+pdb_add_groupmem: NTSTATUS (TALLOC_CTX *, uint32_t, uint32_t)
+pdb_add_sam_account: NTSTATUS (struct samu *)
+pdb_build_fields_present: uint32_t (struct samu *)
+pdb_capabilities: uint32_t (void)
+pdb_copy_sam_account: bool (struct samu *, struct samu *)
+pdb_create_alias: NTSTATUS (const char *, uint32_t *)
+pdb_create_builtin: NTSTATUS (uint32_t)
+pdb_create_builtin_alias: NTSTATUS (uint32_t, gid_t)
+pdb_create_dom_group: NTSTATUS (TALLOC_CTX *, const char *, uint32_t *)
+pdb_create_user: NTSTATUS (TALLOC_CTX *, const char *, uint32_t, uint32_t *)
+pdb_decode_acct_ctrl: uint32_t (const char *)
+pdb_default_add_aliasmem: NTSTATUS (struct pdb_methods *, const struct dom_sid *, const struct dom_sid *)
+pdb_default_add_group_mapping_entry: NTSTATUS (struct pdb_methods *, GROUP_MAP *)
+pdb_default_alias_memberships: NTSTATUS (struct pdb_methods *, TALLOC_CTX *, const struct dom_sid *, const struct dom_sid *, size_t, uint32_t **, size_t *)
+pdb_default_create_alias: NTSTATUS (struct pdb_methods *, const char *, uint32_t *)
+pdb_default_del_aliasmem: NTSTATUS (struct pdb_methods *, const struct dom_sid *, const struct dom_sid *)
+pdb_default_delete_alias: NTSTATUS (struct pdb_methods *, const struct dom_sid *)
+pdb_default_delete_group_mapping_entry: NTSTATUS (struct pdb_methods *, struct dom_sid)
+pdb_default_enum_aliasmem: NTSTATUS (struct pdb_methods *, const struct dom_sid *, TALLOC_CTX *, struct dom_sid **, size_t *)
+pdb_default_enum_group_mapping: NTSTATUS (struct pdb_methods *, const struct dom_sid *, enum lsa_SidType, GROUP_MAP ***, size_t *, bool)
+pdb_default_get_aliasinfo: NTSTATUS (struct pdb_methods *, const struct dom_sid *, struct acct_info *)
+pdb_default_getgrgid: NTSTATUS (struct pdb_methods *, GROUP_MAP *, gid_t)
+pdb_default_getgrnam: NTSTATUS (struct pdb_methods *, GROUP_MAP *, const char *)
+pdb_default_getgrsid: NTSTATUS (struct pdb_methods *, GROUP_MAP *, struct dom_sid)
+pdb_default_set_aliasinfo: NTSTATUS (struct pdb_methods *, const struct dom_sid *, struct acct_info *)
+pdb_default_update_group_mapping_entry: NTSTATUS (struct pdb_methods *, GROUP_MAP *)
+pdb_del_aliasmem: NTSTATUS (const struct dom_sid *, const struct dom_sid *)
+pdb_del_groupmem: NTSTATUS (TALLOC_CTX *, uint32_t, uint32_t)
+pdb_del_trusted_domain: NTSTATUS (const char *)
+pdb_del_trusteddom_pw: bool (const char *)
+pdb_delete_alias: NTSTATUS (const struct dom_sid *)
+pdb_delete_dom_group: NTSTATUS (TALLOC_CTX *, uint32_t)
+pdb_delete_group_mapping_entry: NTSTATUS (struct dom_sid)
+pdb_delete_sam_account: NTSTATUS (struct samu *)
+pdb_delete_secret: NTSTATUS (const char *)
+pdb_delete_user: NTSTATUS (TALLOC_CTX *, struct samu *)
+pdb_element_is_changed: bool (const struct samu *, enum pdb_elements)
+pdb_element_is_set_or_changed: bool (const struct samu *, enum pdb_elements)
+pdb_encode_acct_ctrl: char *(uint32_t, size_t)
+pdb_enum_alias_memberships: NTSTATUS (TALLOC_CTX *, const struct dom_sid *, const struct dom_sid *, size_t, uint32_t **, size_t *)
+pdb_enum_aliasmem: NTSTATUS (const struct dom_sid *, TALLOC_CTX *, struct dom_sid **, size_t *)
+pdb_enum_group_mapping: bool (const struct dom_sid *, enum lsa_SidType, GROUP_MAP ***, size_t *, bool)
+pdb_enum_group_members: NTSTATUS (TALLOC_CTX *, const struct dom_sid *, uint32_t **, size_t *)
+pdb_enum_group_memberships: NTSTATUS (TALLOC_CTX *, struct samu *, struct dom_sid **, gid_t **, uint32_t *)
+pdb_enum_trusted_domains: NTSTATUS (TALLOC_CTX *, uint32_t *, struct pdb_trusted_domain ***)
+pdb_enum_trusteddoms: NTSTATUS (TALLOC_CTX *, uint32_t *, struct trustdom_info ***)
+pdb_enum_upn_suffixes: NTSTATUS (TALLOC_CTX *, uint32_t *, char ***)
+pdb_find_backend_entry: struct pdb_init_function_entry *(const char *)
+pdb_get_account_policy: bool (enum pdb_policy_type, uint32_t *)
+pdb_get_acct_ctrl: uint32_t (const struct samu *)
+pdb_get_acct_desc: const char *(const struct samu *)
+pdb_get_aliasinfo: NTSTATUS (const struct dom_sid *, struct acct_info *)
+pdb_get_backend_private_data: void *(const struct samu *, const struct pdb_methods *)
+pdb_get_backends: const struct pdb_init_function_entry *(void)
+pdb_get_bad_password_count: uint16_t (const struct samu *)
+pdb_get_bad_password_time: time_t (const struct samu *)
+pdb_get_code_page: uint16_t (const struct samu *)
+pdb_get_comment: const char *(const struct samu *)
+pdb_get_country_code: uint16_t (const struct samu *)
+pdb_get_dir_drive: const char *(const struct samu *)
+pdb_get_domain: const char *(const struct samu *)
+pdb_get_domain_info: struct pdb_domain_info *(TALLOC_CTX *)
+pdb_get_fullname: const char *(const struct samu *)
+pdb_get_group_rid: uint32_t (struct samu *)
+pdb_get_group_sid: const struct dom_sid *(struct samu *)
+pdb_get_homedir: const char *(const struct samu *)
+pdb_get_hours: const uint8_t *(const struct samu *)
+pdb_get_hours_len: uint32_t (const struct samu *)
+pdb_get_init_flags: enum pdb_value_state (const struct samu *, enum pdb_elements)
+pdb_get_kickoff_time: time_t (const struct samu *)
+pdb_get_lanman_passwd: const uint8_t *(const struct samu *)
+pdb_get_logoff_time: time_t (const struct samu *)
+pdb_get_logon_count: uint16_t (const struct samu *)
+pdb_get_logon_divs: uint16_t (const struct samu *)
+pdb_get_logon_script: const char *(const struct samu *)
+pdb_get_logon_time: time_t (const struct samu *)
+pdb_get_munged_dial: const char *(const struct samu *)
+pdb_get_nt_passwd: const uint8_t *(const struct samu *)
+pdb_get_nt_username: const char *(const struct samu *)
+pdb_get_pass_can_change: bool (const struct samu *)
+pdb_get_pass_can_change_time: time_t (const struct samu *)
+pdb_get_pass_can_change_time_noncalc: time_t (const struct samu *)
+pdb_get_pass_last_set_time: time_t (const struct samu *)
+pdb_get_pass_must_change_time: time_t (const struct samu *)
+pdb_get_plaintext_passwd: const char *(const struct samu *)
+pdb_get_profile_path: const char *(const struct samu *)
+pdb_get_pw_history: const uint8_t *(const struct samu *, uint32_t *)
+pdb_get_secret: NTSTATUS (TALLOC_CTX *, const char *, DATA_BLOB *, NTTIME *, DATA_BLOB *, NTTIME *, struct security_descriptor **)
+pdb_get_seq_num: bool (time_t *)
+pdb_get_tevent_context: struct tevent_context *(void)
+pdb_get_trust_credentials: NTSTATUS (const char *, const char *, TALLOC_CTX *, struct cli_credentials **)
+pdb_get_trusted_domain: NTSTATUS (TALLOC_CTX *, const char *, struct pdb_trusted_domain **)
+pdb_get_trusted_domain_by_sid: NTSTATUS (TALLOC_CTX *, struct dom_sid *, struct pdb_trusted_domain **)
+pdb_get_trusteddom_creds: NTSTATUS (const char *, TALLOC_CTX *, struct cli_credentials **)
+pdb_get_trusteddom_pw: bool (const char *, char **, struct dom_sid *, time_t *)
+pdb_get_unknown_6: uint32_t (const struct samu *)
+pdb_get_user_rid: uint32_t (const struct samu *)
+pdb_get_user_sid: const struct dom_sid *(const struct samu *)
+pdb_get_username: const char *(const struct samu *)
+pdb_get_workstations: const char *(const struct samu *)
+pdb_getgrgid: bool (GROUP_MAP *, gid_t)
+pdb_getgrnam: bool (GROUP_MAP *, const char *)
+pdb_getgrsid: bool (GROUP_MAP *, struct dom_sid)
+pdb_gethexhours: bool (const char *, unsigned char *)
+pdb_gethexpwd: bool (const char *, unsigned char *)
+pdb_getsampwnam: bool (struct samu *, const char *)
+pdb_getsampwsid: bool (struct samu *, const struct dom_sid *)
+pdb_group_rid_to_gid: gid_t (uint32_t)
+pdb_id_to_sid: bool (struct unixid *, struct dom_sid *)
+pdb_increment_bad_password_count: bool (struct samu *)
+pdb_is_password_change_time_max: bool (time_t)
+pdb_is_responsible_for_builtin: bool (void)
+pdb_is_responsible_for_everything_else: bool (void)
+pdb_is_responsible_for_our_sam: bool (void)
+pdb_is_responsible_for_unix_groups: bool (void)
+pdb_is_responsible_for_unix_users: bool (void)
+pdb_is_responsible_for_wellknown: bool (void)
+pdb_lookup_rids: NTSTATUS (const struct dom_sid *, int, uint32_t *, const char **, enum lsa_SidType *)
+pdb_new_rid: bool (uint32_t *)
+pdb_nop_add_group_mapping_entry: NTSTATUS (struct pdb_methods *, GROUP_MAP *)
+pdb_nop_delete_group_mapping_entry: NTSTATUS (struct pdb_methods *, struct dom_sid)
+pdb_nop_enum_group_mapping: NTSTATUS (struct pdb_methods *, enum lsa_SidType, GROUP_MAP **, size_t *, bool)
+pdb_nop_getgrgid: NTSTATUS (struct pdb_methods *, GROUP_MAP *, gid_t)
+pdb_nop_getgrnam: NTSTATUS (struct pdb_methods *, GROUP_MAP *, const char *)
+pdb_nop_getgrsid: NTSTATUS (struct pdb_methods *, GROUP_MAP *, struct dom_sid)
+pdb_nop_update_group_mapping_entry: NTSTATUS (struct pdb_methods *, GROUP_MAP *)
+pdb_rename_sam_account: NTSTATUS (struct samu *, const char *)
+pdb_search_aliases: struct pdb_search *(TALLOC_CTX *, const struct dom_sid *)
+pdb_search_entries: uint32_t (struct pdb_search *, uint32_t, uint32_t, struct samr_displayentry **)
+pdb_search_groups: struct pdb_search *(TALLOC_CTX *)
+pdb_search_users: struct pdb_search *(TALLOC_CTX *, uint32_t)
+pdb_set_account_policy: bool (enum pdb_policy_type, uint32_t)
+pdb_set_acct_ctrl: bool (struct samu *, uint32_t, enum pdb_value_state)
+pdb_set_acct_desc: bool (struct samu *, const char *, enum pdb_value_state)
+pdb_set_aliasinfo: NTSTATUS (const struct dom_sid *, struct acct_info *)
+pdb_set_backend_private_data: bool (struct samu *, void *, void (*)(void **), const struct pdb_methods *, enum pdb_value_state)
+pdb_set_bad_password_count: bool (struct samu *, uint16_t, enum pdb_value_state)
+pdb_set_bad_password_time: bool (struct samu *, time_t, enum pdb_value_state)
+pdb_set_code_page: bool (struct samu *, uint16_t, enum pdb_value_state)
+pdb_set_comment: bool (struct samu *, const char *, enum pdb_value_state)
+pdb_set_country_code: bool (struct samu *, uint16_t, enum pdb_value_state)
+pdb_set_dir_drive: bool (struct samu *, const char *, enum pdb_value_state)
+pdb_set_domain: bool (struct samu *, const char *, enum pdb_value_state)
+pdb_set_fullname: bool (struct samu *, const char *, enum pdb_value_state)
+pdb_set_group_sid: bool (struct samu *, const struct dom_sid *, enum pdb_value_state)
+pdb_set_group_sid_from_rid: bool (struct samu *, uint32_t, enum pdb_value_state)
+pdb_set_homedir: bool (struct samu *, const char *, enum pdb_value_state)
+pdb_set_hours: bool (struct samu *, const uint8_t *, int, enum pdb_value_state)
+pdb_set_hours_len: bool (struct samu *, uint32_t, enum pdb_value_state)
+pdb_set_init_flags: bool (struct samu *, enum pdb_elements, enum pdb_value_state)
+pdb_set_kickoff_time: bool (struct samu *, time_t, enum pdb_value_state)
+pdb_set_lanman_passwd: bool (struct samu *, const uint8_t *, enum pdb_value_state)
+pdb_set_logoff_time: bool (struct samu *, time_t, enum pdb_value_state)
+pdb_set_logon_count: bool (struct samu *, uint16_t, enum pdb_value_state)
+pdb_set_logon_divs: bool (struct samu *, uint16_t, enum pdb_value_state)
+pdb_set_logon_script: bool (struct samu *, const char *, enum pdb_value_state)
+pdb_set_logon_time: bool (struct samu *, time_t, enum pdb_value_state)
+pdb_set_munged_dial: bool (struct samu *, const char *, enum pdb_value_state)
+pdb_set_nt_passwd: bool (struct samu *, const uint8_t *, enum pdb_value_state)
+pdb_set_nt_username: bool (struct samu *, const char *, enum pdb_value_state)
+pdb_set_pass_can_change: bool (struct samu *, bool)
+pdb_set_pass_can_change_time: bool (struct samu *, time_t, enum pdb_value_state)
+pdb_set_pass_last_set_time: bool (struct samu *, time_t, enum pdb_value_state)
+pdb_set_plaintext_passwd: bool (struct samu *, const char *)
+pdb_set_plaintext_pw_only: bool (struct samu *, const char *, enum pdb_value_state)
+pdb_set_profile_path: bool (struct samu *, const char *, enum pdb_value_state)
+pdb_set_pw_history: bool (struct samu *, const uint8_t *, uint32_t, enum pdb_value_state)
+pdb_set_secret: NTSTATUS (const char *, DATA_BLOB *, DATA_BLOB *, struct security_descriptor *)
+pdb_set_trusted_domain: NTSTATUS (const char *, const struct pdb_trusted_domain *)
+pdb_set_trusteddom_pw: bool (const char *, const char *, const struct dom_sid *)
+pdb_set_unix_primary_group: NTSTATUS (TALLOC_CTX *, struct samu *)
+pdb_set_unknown_6: bool (struct samu *, uint32_t, enum pdb_value_state)
+pdb_set_upn_suffixes: NTSTATUS (uint32_t, const char **)
+pdb_set_user_sid: bool (struct samu *, const struct dom_sid *, enum pdb_value_state)
+pdb_set_user_sid_from_rid: bool (struct samu *, uint32_t, enum pdb_value_state)
+pdb_set_user_sid_from_string: bool (struct samu *, const char *, enum pdb_value_state)
+pdb_set_username: bool (struct samu *, const char *, enum pdb_value_state)
+pdb_set_workstations: bool (struct samu *, const char *, enum pdb_value_state)
+pdb_sethexhours: void (char *, const unsigned char *)
+pdb_sethexpwd: void (char *, const unsigned char *, uint32_t)
+pdb_sid_to_id: bool (const struct dom_sid *, struct unixid *)
+pdb_sid_to_id_unix_users_and_groups: bool (const struct dom_sid *, struct unixid *)
+pdb_update_autolock_flag: bool (struct samu *, bool *)
+pdb_update_bad_password_count: bool (struct samu *, bool *)
+pdb_update_group_mapping_entry: NTSTATUS (GROUP_MAP *)
+pdb_update_history: bool (struct samu *, const uint8_t *)
+pdb_update_login_attempts: NTSTATUS (struct samu *, bool)
+pdb_update_sam_account: NTSTATUS (struct samu *)
+privilege_create_account: NTSTATUS (const struct dom_sid *)
+privilege_delete_account: NTSTATUS (const struct dom_sid *)
+privilege_enum_sids: NTSTATUS (enum sec_privilege, TALLOC_CTX *, struct dom_sid **, int *)
+privilege_enumerate_accounts: NTSTATUS (struct dom_sid **, int *)
+revoke_all_privileges: bool (const struct dom_sid *)
+revoke_privilege_by_name: bool (const struct dom_sid *, const char *)
+revoke_privilege_set: bool (const struct dom_sid *, struct lsa_PrivilegeSet *)
+samu_alloc_rid_unix: NTSTATUS (struct pdb_methods *, struct samu *, const struct passwd *)
+samu_new: struct samu *(TALLOC_CTX *)
+samu_set_unix: NTSTATUS (struct samu *, const struct passwd *)
+secrets_trusted_domains: NTSTATUS (TALLOC_CTX *, uint32_t *, struct trustdom_info ***)
+sid_check_is_builtin: bool (const struct dom_sid *)
+sid_check_is_for_passdb: bool (const struct dom_sid *)
+sid_check_is_in_builtin: bool (const struct dom_sid *)
+sid_check_is_in_unix_groups: bool (const struct dom_sid *)
+sid_check_is_in_unix_users: bool (const struct dom_sid *)
+sid_check_is_in_wellknown_domain: bool (const struct dom_sid *)
+sid_check_is_unix_groups: bool (const struct dom_sid *)
+sid_check_is_unix_users: bool (const struct dom_sid *)
+sid_check_is_wellknown_builtin: bool (const struct dom_sid *)
+sid_check_is_wellknown_domain: bool (const struct dom_sid *, const char **)
+sid_check_object_is_for_passdb: bool (const struct dom_sid *)
+sid_to_gid: bool (const struct dom_sid *, gid_t *)
+sid_to_uid: bool (const struct dom_sid *, uid_t *)
+sids_to_unixids: bool (const struct dom_sid *, uint32_t, struct unixid *)
+smb_add_user_group: int (const char *, const char *)
+smb_create_group: int (const char *, gid_t *)
+smb_delete_group: int (const char *)
+smb_delete_user_group: int (const char *, const char *)
+smb_nscd_flush_group_cache: void (void)
+smb_nscd_flush_user_cache: void (void)
+smb_register_passdb: NTSTATUS (int, const char *, pdb_init_function)
+smb_set_primary_group: int (const char *, const char *)
+uid_to_sid: void (struct dom_sid *, uid_t)
+uid_to_unix_users_sid: void (uid_t, struct dom_sid *)
+unix_groups_domain_name: const char *(void)
+unix_users_domain_name: const char *(void)
+unixid_from_both: void (struct unixid *, uint32_t)
+unixid_from_gid: void (struct unixid *, uint32_t)
+unixid_from_uid: void (struct unixid *, uint32_t)
+wb_is_trusted_domain: wbcErr (const char *)
+winbind_allocate_gid: bool (gid_t *)
+winbind_allocate_uid: bool (uid_t *)
+winbind_getpwnam: struct passwd *(const char *)
+winbind_getpwsid: struct passwd *(const struct dom_sid *)
+winbind_gid_to_sid: bool (struct dom_sid *, gid_t)
+winbind_lookup_name: bool (const char *, const char *, struct dom_sid *, enum lsa_SidType *)
+winbind_lookup_rids: bool (TALLOC_CTX *, const struct dom_sid *, int, uint32_t *, const char **, const char ***, enum lsa_SidType **)
+winbind_lookup_sid: bool (TALLOC_CTX *, const struct dom_sid *, const char **, const char **, enum lsa_SidType *)
+winbind_lookup_usersids: bool (TALLOC_CTX *, const struct dom_sid *, uint32_t *, struct dom_sid **)
+winbind_ping: bool (void)
+winbind_sid_to_gid: bool (gid_t *, const struct dom_sid *)
+winbind_sid_to_uid: bool (uid_t *, const struct dom_sid *)
+winbind_uid_to_sid: bool (struct dom_sid *, uid_t)
+winbind_xid_to_sid: bool (struct dom_sid *, const struct unixid *)
+xid_to_sid: void (struct dom_sid *, const struct unixid *)
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index 6bda783..2281bd0 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -1109,99 +1109,6 @@ bool lookup_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid,
 }
 
 /*****************************************************************
- Id mapping cache.  This is to avoid Winbind mappings already
- seen by smbd to be queried too frequently, keeping winbindd
- busy, and blocking smbd while winbindd is busy with other
- stuff. Written by Michael Steffens <[e-mail]>,
- modified to use linked lists by jra.
-*****************************************************************/  
-
-
-/*****************************************************************
- *THE LEGACY* convert uid_t to SID function.
-*****************************************************************/  
-
-static void legacy_uid_to_sid(struct dom_sid *psid, uid_t uid)
-{
-	bool ret;
-	struct unixid id;
-	struct dom_sid_buf buf;
-
-	ZERO_STRUCTP(psid);
-
-	id.id = uid;
-	id.type = ID_TYPE_UID;
-
-	become_root();
-	ret = pdb_id_to_sid(&id, psid);
-	unbecome_root();
-
-	if (ret) {
-		/* This is a mapped user */
-		goto done;
-	}
-
-	/* This is an unmapped user */
-
-	uid_to_unix_users_sid(uid, psid);
-
-	{
-		struct unixid xid = {
-			.id = uid, .type = ID_TYPE_UID
-		};
-		idmap_cache_set_sid2unixid(psid, &xid);
-	}
-
- done:
-	DEBUG(10,("LEGACY: uid %u -> sid %s\n", (unsigned int)uid,
-		  dom_sid_str_buf(psid, &buf)));
-
-	return;
-}
-
-/*****************************************************************
- *THE LEGACY* convert gid_t to SID function.
-*****************************************************************/  
-
-static void legacy_gid_to_sid(struct dom_sid *psid, gid_t gid)
-{
-	bool ret;
-	struct unixid id;
-	struct dom_sid_buf buf;
-
-	ZERO_STRUCTP(psid);
-
-	id.id = gid;
-	id.type = ID_TYPE_GID;
-
-	become_root();
-	ret = pdb_id_to_sid(&id, psid);
-	unbecome_root();
-
-	if (ret) {
-		/* This is a mapped group */
-		goto done;
-	}
-
-	/* This is an unmapped group */
-
-	gid_to_unix_groups_sid(gid, psid);
-
-	{
-		struct unixid xid = {
-			.id = gid, .type = ID_TYPE_GID
-		};
-		idmap_cache_set_sid2unixid(psid, &xid);
-	}
-
- done:
-	DEBUG(10,("LEGACY: gid %u -> sid %s\n", (unsigned int)gid,
-		  dom_sid_str_buf(psid, &buf)));
-
-	return;
-}
-
-/*****************************************************************
  *THE LEGACY* convert SID to id function.
 *****************************************************************/  
 
@@ -1249,104 +1156,90 @@ static bool legacy_sid_to_uid(const struct dom_sid *psid, uid_t *puid)
 	return false;
 }
 
-/*****************************************************************
- *THE CANONICAL* convert uid_t to SID function.
-*****************************************************************/  
-
-void uid_to_sid(struct dom_sid *psid, uid_t uid)
+void xid_to_sid(struct dom_sid *psid, const struct unixid *xid)
 {
 	bool expired = true;
 	bool ret;
 	struct dom_sid_buf buf;
-	ZERO_STRUCTP(psid);
 
-	/* Check the winbindd cache directly. */
-	ret = idmap_cache_find_uid2sid(uid, psid, &expired);
+	SMB_ASSERT(xid->type == ID_TYPE_UID || xid->type == ID_TYPE_GID);
+
+	*psid = (struct dom_sid) {0};
+
+	ret = idmap_cache_find_xid2sid(xid, psid, &expired);
+	if (ret && !expired) {
+		DBG_DEBUG("%cID %"PRIu32" -> %s from cache\n",
+			  xid->type == ID_TYPE_UID ? 'U' : 'G',
+			  xid->id,
+			  dom_sid_str_buf(psid, &buf));
+		goto done;
+	}
 
-	if (ret && !expired && is_null_sid(psid)) {
+	ret = winbind_xid_to_sid(psid, xid);
+	if (ret) {
 		/*
-		 * Negative cache entry, we already asked.
-		 * do legacy.
+		 * winbind can return an explicit negative mapping
+		 * here. It's up to winbind to prime the cache either
+		 * positively or negatively, don't mess with the cache
+		 * here.
 		 */
-		legacy_uid_to_sid(psid, uid);
-		return;
+		DBG_DEBUG("%cID %"PRIu32" -> %s from cache\n",
+			  xid->type == ID_TYPE_UID ? 'U' : 'G',
+			  xid->id,
+			  dom_sid_str_buf(psid, &buf));
+		goto done;
 	}
 
-	if (!ret || expired) {
-		/* Not in cache. Ask winbindd. */
-		if (!winbind_uid_to_sid(psid, uid)) {
-			/*
-			 * We shouldn't return the NULL SID
-			 * here if winbind was running and
-			 * couldn't map, as winbind will have
-			 * added a negative entry that will
-			 * cause us to go though the
-			 * legacy_uid_to_sid()
-			 * function anyway in the case above
-			 * the next time we ask.
-			 */
-			DEBUG(5, ("uid_to_sid: winbind failed to find a sid "
-				  "for uid %u\n", (unsigned int)uid));
+	{
+		/*
+		 * Make a copy, pdb_id_to_sid might want to turn
+		 * xid->type into ID_TYPE_BOTH, which we ignore here.
+		 */
+		struct unixid rw_xid = *xid;
 
-			legacy_uid_to_sid(psid, uid);
-			return;
-		}
+		become_root();
+		ret = pdb_id_to_sid(&rw_xid, psid);
+		unbecome_root();
 	}
 
-	DEBUG(10,("uid %u -> sid %s\n", (unsigned int)uid,
-		  dom_sid_str_buf(psid, &buf)));
-
-	return;
-}
-
-/*****************************************************************
- *THE CANONICAL* convert gid_t to SID function.
-*****************************************************************/  
-
-void gid_to_sid(struct dom_sid *psid, gid_t gid)
-{
-	bool expired = true;
-	bool ret;
-	struct dom_sid_buf buf;
-	ZERO_STRUCTP(psid);
-
-	/* Check the winbindd cache directly. */
-	ret = idmap_cache_find_gid2sid(gid, psid, &expired);
+	if (ret) {
+		DBG_DEBUG("%cID %"PRIu32" -> %s from passdb\n",
+			  xid->type == ID_TYPE_UID ? 'U' : 'G',
+			  xid->id,
+			  dom_sid_str_buf(psid, &buf));
+		goto done;
+	}
 
-	if (ret && !expired && is_null_sid(psid)) {
+done:
+	if (is_null_sid(psid)) {
 		/*
-		 * Negative cache entry, we already asked.
-		 * do legacy.
+		 * Nobody found anything: Return S-1-22-xx-yy. Don't
+		 * store that in caches, this is up to the layers
+		 * beneath us.
 		 */
-		legacy_gid_to_sid(psid, gid);
-		return;
-	}
-
-	if (!ret || expired) {
-		/* Not in cache. Ask winbindd. */
-		if (!winbind_gid_to_sid(psid, gid)) {
-			/*
-			 * We shouldn't return the NULL SID
-			 * here if winbind was running and
-			 * couldn't map, as winbind will have
-			 * added a negative entry that will
-			 * cause us to go though the
-			 * legacy_gid_to_sid()
-			 * function anyway in the case above
-			 * the next time we ask.
-			 */
-			DEBUG(5, ("gid_to_sid: winbind failed to find a sid "
-				  "for gid %u\n", (unsigned int)gid));
-
-			legacy_gid_to_sid(psid, gid);
-			return;
+		if (xid->type == ID_TYPE_UID) {
+			uid_to_unix_users_sid(xid->id, psid);
+		} else {
+			gid_to_unix_groups_sid(xid->id, psid);
 		}
+
+		DBG_DEBUG("%cID %"PRIu32" -> %s fallback\n",
+			  xid->type == ID_TYPE_UID ? 'U' : 'G',
+			  xid->id,
+			  dom_sid_str_buf(psid, &buf));
 	}
+}
 
-	DEBUG(10,("gid %u -> sid %s\n", (unsigned int)gid,
-		  dom_sid_str_buf(psid, &buf)));
+void uid_to_sid(struct dom_sid *psid, uid_t uid)
+{
+	struct unixid xid = { .type = ID_TYPE_UID, .id = uid};
+	xid_to_sid(psid, &xid);
+}
 
-	return;
+void gid_to_sid(struct dom_sid *psid, gid_t gid)
+{
+	struct unixid xid = { .type = ID_TYPE_GID, .id = gid};
+	xid_to_sid(psid, &xid);
 }
 
 bool sids_to_unixids(const struct dom_sid *sids, uint32_t num_sids,
diff --git a/source3/passdb/lookup_sid.h b/source3/passdb/lookup_sid.h
index 8b5edf6..8a21cca 100644
--- a/source3/passdb/lookup_sid.h
+++ b/source3/passdb/lookup_sid.h
@@ -83,6 +83,7 @@ bool lookup_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid,
 		enum lsa_SidType *ret_type);
 void uid_to_sid(struct dom_sid *psid, uid_t uid);
 void gid_to_sid(struct dom_sid *psid, gid_t gid);
+void xid_to_sid(struct dom_sid *psid, const struct unixid *xid);
 bool sid_to_uid(const struct dom_sid *psid, uid_t *puid);
 bool sid_to_gid(const struct dom_sid *psid, gid_t *pgid);
 bool sids_to_unixids(const struct dom_sid *sids, uint32_t num_sids,
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 5d7e496..e8d5165 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -200,6 +200,7 @@ local_tests = [
     "LOCAL-G-LOCK5",
     "LOCAL-G-LOCK6",
     "LOCAL-NAMEMAP-CACHE1",
+    "LOCAL-IDMAP-CACHE1",
     "LOCAL-hex_encode_buf",
     "LOCAL-remove_duplicate_addrs2"]
 
diff --git a/source3/torture/proto.h b/source3/torture/proto.h
index 669e077..b4a2007 100644
--- a/source3/torture/proto.h
+++ b/source3/torture/proto.h
@@ -137,6 +137,7 @@ bool run_g_lock5(int dummy);
 bool run_g_lock6(int dummy);
 bool run_g_lock_ping_pong(int dummy);
 bool run_local_namemap_cache1(int dummy);
+bool run_local_idmap_cache1(int dummy);
 bool run_hidenewfiles(int dummy);
 
 #endif /* __TORTURE_H__ */
diff --git a/source3/torture/test_idmap_cache.c b/source3/torture/test_idmap_cache.c
new file mode 100644
index 0000000..b9cba3b
--- /dev/null
+++ b/source3/torture/test_idmap_cache.c
@@ -0,0 +1,122 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Test dbwrap_watch API
+ * Copyright (C) Volker Lendecke 2017
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "includes.h"
+#include "torture/proto.h"
+#include "lib/idmap_cache.h"
+#include "librpc/gen_ndr/idmap.h"
+#include "libcli/security/dom_sid.h"
+
+bool run_local_idmap_cache1(int dummy)
+{
+	struct dom_sid sid, found_sid;
+	struct unixid xid, found_xid;
+	bool ret = false;
+	bool expired = false;
+
+	xid = (struct unixid) { .id = 1234, .type = ID_TYPE_UID };
+	dom_sid_parse("S-1-5-21-2864185242-3846410404-2398417794-1235", &sid);
+	idmap_cache_set_sid2unixid(&sid, &xid);
+
+	ret = idmap_cache_find_sid2unixid(&sid, &found_xid, &expired);
+	if (!ret) {
+		fprintf(stderr, "idmap_cache_find_sid2unixid failed\n");
+		goto done;
+	}
+	if (expired) {
+		fprintf(stderr,
+			"idmap_cache_find_sid2unixid returned an expired "
+			"value\n");
+		goto done;
+	}
+	if ((xid.type != found_xid.type) || (xid.id != found_xid.id)) {
+		fprintf(stderr,
+			"idmap_cache_find_sid2unixid returned wrong "
+			"values\n");
+		goto done;
+	}
+
+	ret = idmap_cache_find_xid2sid(&xid, &found_sid, &expired);
+	if (!ret) {
+		fprintf(stderr, "idmap_cache_find_xid2sid failed\n");
+		goto done;
+	}
+	if (expired) {
+		fprintf(stderr,
+			"idmap_cache_find_xid2sid returned an expired "
+			"value\n");
+		goto done;
+	}
+	if (!dom_sid_equal(&sid, &found_sid)) {
+		fprintf(stderr,
+			"idmap_cache_find_xid2sid returned wrong sid\n");
+		goto done;
+	}
+
+	xid.type = ID_TYPE_GID;
+
+	ret = idmap_cache_find_xid2sid(&xid, &found_sid, &expired);
+	if (ret) {
+		fprintf(stderr,
+			"idmap_cache_find_xid2sid found a GID where it "
+			"should not\n");
+		goto done;
+	}
+
+	idmap_cache_del_sid(&sid);
+
+	xid.type = ID_TYPE_UID;
+	ret = idmap_cache_find_xid2sid(&xid, &found_sid, &expired);
+	if (ret) {
+		fprintf(stderr,
+			"idmap_cache_find_xid2sid found a UID where it "
+			"should not\n");
+		goto done;
+	}
+
+	/*
+	 * Test that negative mappings can also be cached
+	 */
+	sid = (struct dom_sid) {0};
+	xid = (struct unixid) { .id = 1234, .type = ID_TYPE_UID };
+	idmap_cache_set_sid2unixid(&sid, &xid);
+
+	ret = idmap_cache_find_xid2sid(&xid, &found_sid, &expired);
+	if (!ret) {
+		fprintf(stderr,
+			"idmap_cache_find_xid2sid failed to find "
+			"negative mapping\n");
+		goto done;
+	}
+	if (expired) {
+		fprintf(stderr,
+			"idmap_cache_find_xid2sid returned an expired "
+			"value\n");
+		goto done;
+	}
+	if (!dom_sid_equal(&sid, &found_sid)) {
+		fprintf(stderr,
+			"idmap_cache_find_xid2sid returned wrong sid\n");
+		goto done;
+	}
+
+	ret = true;
+done:
+	return ret;
+}
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 0d00f1f..018ebba 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -12081,6 +12081,7 @@ static struct {
 	{ "LOCAL-G-LOCK-PING-PONG", run_g_lock_ping_pong, 0 },
 	{ "LOCAL-CANONICALIZE-PATH", run_local_canonicalize_path, 0 },
 	{ "LOCAL-NAMEMAP-CACHE1", run_local_namemap_cache1, 0 },
+	{ "LOCAL-IDMAP-CACHE1", run_local_idmap_cache1, 0 },
 	{ "qpathinfo-bufsize", run_qpathinfo_bufsize, 0 },
 	{ "hide-new-files-timeout", run_hidenewfiles, 0 },
 	{NULL, NULL, 0}};
diff --git a/source3/winbindd/wb_xids2sids.c b/source3/winbindd/wb_xids2sids.c
index fdd98a3..c5a3527 100644
--- a/source3/winbindd/wb_xids2sids.c
+++ b/source3/winbindd/wb_xids2sids.c
@@ -246,6 +246,7 @@ static NTSTATUS wb_xids2sids_init_dom_maps_recv(struct tevent_req *req)
 struct wb_xids2sids_dom_state {
 	struct tevent_context *ev;
 	struct unixid *all_xids;
+	const bool *cached;
 	size_t num_all_xids;
 	struct dom_sid *all_sids;
 	struct wb_xids2sids_dom_map *dom_map;
@@ -262,7 +263,10 @@ static void wb_xids2sids_dom_gotdc(struct tevent_req *subreq);
 static struct tevent_req *wb_xids2sids_dom_send(
 	TALLOC_CTX *mem_ctx, struct tevent_context *ev,
 	struct wb_xids2sids_dom_map *dom_map,
-	struct unixid *xids, size_t num_xids, struct dom_sid *sids)
+	struct unixid *xids,
+	const bool *cached,
+	size_t num_xids,
+	struct dom_sid *sids)
 {
 	struct tevent_req *req, *subreq;
 	struct wb_xids2sids_dom_state *state;
@@ -276,6 +280,7 @@ static struct tevent_req *wb_xids2sids_dom_send(
 	}
 	state->ev = ev;
 	state->all_xids = xids;
+	state->cached = cached;
 	state->num_all_xids = num_xids;
 	state->all_sids = sids;
 	state->dom_map = dom_map;
@@ -296,7 +301,7 @@ static struct tevent_req *wb_xids2sids_dom_send(
 			/* out of range */
 			continue;
 		}
-		if (!is_null_sid(&state->all_sids[i])) {
+		if (state->cached[i]) {
 			/* already mapped */
 			continue;
 		}
@@ -363,7 +368,7 @@ static void wb_xids2sids_dom_done(struct tevent_req *subreq)
 			/* out of range */
 			continue;
 		}
-		if (!is_null_sid(&state->all_sids[i])) {
+		if (state->cached[i]) {
 			/* already mapped */
 			continue;
 		}
@@ -465,22 +470,11 @@ struct tevent_req *wb_xids2sids_send(TALLOC_CTX *mem_ctx,
 		uint32_t i;
 
 		for (i=0; i<num_xids; i++) {
-			struct dom_sid sid;
-			bool ok, expired;
-
-			switch (xids[i].type) {
-			    case ID_TYPE_UID:
-				    ok = idmap_cache_find_uid2sid(
-					    xids[i].id, &sid, &expired);
-				    break;
-			    case ID_TYPE_GID:
-				    ok = idmap_cache_find_gid2sid(
-					    xids[i].id, &sid, &expired);
-				    break;
-			    default:
-				    ok = false;
-			}
+			struct dom_sid sid = {0};
+			bool ok, expired = true;
 
+			ok = idmap_cache_find_xid2sid(
+				&xids[i], &sid, &expired);
 			if (ok && !expired) {
 				sid_copy(&state->sids[i], &sid);
 				state->cached[i] = true;
@@ -520,7 +514,7 @@ static void wb_xids2sids_init_dom_maps_done(struct tevent_req *subreq)
 
 	subreq = wb_xids2sids_dom_send(
 		state, state->ev, &dom_maps[state->dom_idx],
-		state->xids, state->num_xids, state->sids);
+		state->xids, state->cached, state->num_xids, state->sids);
 	if (tevent_req_nomem(subreq, req)) {
 		return;
 	}
@@ -551,6 +545,7 @@ static void wb_xids2sids_done(struct tevent_req *subreq)
 					       state->ev,
 					       &dom_maps[state->dom_idx],
 					       state->xids,
+					       state->cached,
 					       state->num_xids,
 					       state->sids);
 		if (tevent_req_nomem(subreq, req)) {
diff --git a/source3/wscript_build b/source3/wscript_build
index 1ae9105..f0d8596 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -149,7 +149,7 @@ bld.SAMBA3_LIBRARY('samba-passdb',
                                   ''',
                    abi_match=private_pdb_match,
                    abi_directory='passdb/ABI',
-                   vnum='0.27.1')
+                   vnum='0.27.2')
 
 bld.SAMBA3_SUBSYSTEM('pdb',
                    source='''
@@ -1198,6 +1198,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
                         torture/wbc_async.c
                         torture/test_g_lock.c
                         torture/test_namemap_cache.c
+                        torture/test_idmap_cache.c
                         torture/test_hidenewfiles.c
                         ''',
                  deps='''
diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index 732ba15..43a53f8 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -1779,6 +1779,7 @@ union smb_open {
 			/* uint32_t blob_size; */
 
 			/* optional return values matching tagged values in the call */
+			uint32_t maximal_access_status;
 			uint32_t maximal_access;
 			uint8_t on_disk_id[32];
 			struct smb2_lease lease_response;
diff --git a/source4/libcli/smb2/create.c b/source4/libcli/smb2/create.c
index 550069a..eb0f6a4 100644
--- a/source4/libcli/smb2/create.c
+++ b/source4/libcli/smb2/create.c
@@ -360,12 +360,12 @@ NTSTATUS smb2_create_recv(struct smb2_request *req, TALLOC_CTX *mem_ctx, struct 
 	/* pull out the parsed blobs */
 	for (i=0;i<io->out.blobs.num_blobs;i++) {
 		if (strcmp(io->out.blobs.blobs[i].tag, SMB2_CREATE_TAG_MXAC) == 0) {
-			/* TODO: this also contains a status field in
-			   first 4 bytes */
 			if (io->out.blobs.blobs[i].data.length != 8) {
 				smb2_request_destroy(req);
 				return NT_STATUS_INVALID_NETWORK_RESPONSE;
 			}
+			io->out.maximal_access_status =
+				IVAL(io->out.blobs.blobs[i].data.data, 0);
 			io->out.maximal_access = IVAL(io->out.blobs.blobs[i].data.data, 4);
 		}
 		if (strcmp(io->out.blobs.blobs[i].tag, SMB2_CREATE_TAG_QFID) == 0) {
diff --git a/source4/scripting/bin/gen_ntstatus.py b/source4/scripting/bin/gen_ntstatus.py
index e0d4fe3..7691e7b 100755
--- a/source4/scripting/bin/gen_ntstatus.py
+++ b/source4/scripting/bin/gen_ntstatus.py
@@ -20,6 +20,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from __future__ import unicode_literals
+# this file is a bin script and was not imported by any other modules
+# so it should be fine to enable unicode string for python2
 
 import sys, os.path, io, string
 from gen_error_common import parseErrorDescriptions, ErrorDef
@@ -134,20 +137,20 @@ def main ():
         sys.exit()
 
     # read in the data
-    file_contents = open(input_file, "r")
+    file_contents = io.open(input_file, "rt", encoding='utf8')
 
     errors = parseErrorDescriptions(file_contents, False, transformErrorName)
 
     print("writing new header file: %s" % gen_headerfile_name)
-    out_file = open(gen_headerfile_name, "w")
+    out_file = io.open(gen_headerfile_name, "wt", encoding='utf8')
     generateHeaderFile(out_file, errors)
     out_file.close()
     print("writing new source file: %s" % gen_sourcefile_name)
-    out_file = open(gen_sourcefile_name, "w")
+    out_file = io.open(gen_sourcefile_name, "wt", encoding='utf8')
     generateSourceFile(out_file, errors)
     out_file.close()
     print("writing new python file: %s" % gen_pythonfile_name)
-    out_file = open(gen_pythonfile_name, "w")
+    out_file = io.open(gen_pythonfile_name, "wt", encoding='utf8')
     generatePythonFile(out_file, errors)
     out_file.close()
 
diff --git a/source4/scripting/bin/gen_werror.py b/source4/scripting/bin/gen_werror.py
index 700ccaf..6280d2d 100755
--- a/source4/scripting/bin/gen_werror.py
+++ b/source4/scripting/bin/gen_werror.py
@@ -20,6 +20,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from __future__ import unicode_literals
+# this file is a bin script and was not imported by any other modules
+# so it should be fine to enable unicode string for python2
 
 import sys, os.path, io, string
 from gen_error_common import parseErrorDescriptions, ErrorDef
@@ -135,20 +138,20 @@ def main():
         print("usage: %s winerrorfile headerfile sourcefile pythonfile" % sys.argv[0])
         sys.exit()
 
-    input_file = open(input_file_name, "r")
+    input_file = io.open(input_file_name, "rt", encoding='utf8')
     errors = parseErrorDescriptions(input_file, True, transformErrorName)
     input_file.close()
 
     print("writing new header file: %s" % gen_headerfile_name)
-    out_file = open(gen_headerfile_name, "w")
+    out_file = io.open(gen_headerfile_name, "wt", encoding='utf8')
     generateHeaderFile(out_file, errors)
     out_file.close()
     print("writing new source file: %s" % gen_sourcefile_name)
-    out_file = open(gen_sourcefile_name, "w")
+    out_file = io.open(gen_sourcefile_name, "wt", encoding='utf8')
     generateSourceFile(out_file, errors)
     out_file.close()
     print("writing new python file: %s" % gen_pythonfile_name)
-    out_file = open(gen_pythonfile_name, "w")
+    out_file = io.open(gen_pythonfile_name, "wt", encoding='utf8')
     generatePythonFile(out_file, errors)
     out_file.close()
 
diff --git a/source4/scripting/bin/sambaundoguididx b/source4/scripting/bin/sambaundoguididx
index 008e798..20a84c3 100755
--- a/source4/scripting/bin/sambaundoguididx
+++ b/source4/scripting/bin/sambaundoguididx
@@ -57,8 +57,7 @@ privatedir = os.path.dirname(url)
 
 dbs = []
 for part in partitions[0]['partition']:
-    file_quoted = part.split(":")[1]
-    tdbname = urllib.unquote(file_quoted)
+    tdbname = part.split(":")[1]
     tdbpath = os.path.join(privatedir, tdbname)
 
     db = ldb.Ldb(url=tdbpath, options=["modules:"])
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index eeb46ff..297da1d 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -231,6 +231,41 @@ _NORETURN_ static void max_runtime_handler(struct tevent_context *ev,
 }
 
 /*
+ * When doing an in-place upgrade of Samba, the database format may have
+ * changed between versions. E.g. between 4.7 and 4.8 the DB changed from
+ * DN-based indexes to GUID-based indexes, so we have to re-index the DB after
+ * upgrading.
+ * This function handles migrating an older samba DB to a new Samba release.
+ * Note that we have to maintain DB compatibility between *all* older versions
+ * of Samba, not just the ones still under maintenance support.
+ */
+static int handle_inplace_db_upgrade(struct ldb_context *ldb_ctx)
+{
+	int ret;
+
+	/*
+	 * The DSDB stack will handle reindexing the DB (if needed) upon the first
+	 * DB write. Open and close a transaction on the DB now to trigger a
+	 * reindex if required, rather than waiting for the first write.
+	 * We do this here to guarantee that the DB will have been re-indexed by
+	 * the time the main samba code runs.
+	 * Refer to dsdb_schema_set_indices_and_attributes() for the actual reindexing
+	 * code, called from
+	 * source4/dsdb/samdb/ldb_modules/schema_load.c:schema_load_start_transaction()
+	 */
+	ret = ldb_transaction_start(ldb_ctx);
+	if (ret != LDB_SUCCESS) {
+		return ret;
+	}
+
+	ret = ldb_transaction_commit(ldb_ctx);
+	if (ret != LDB_SUCCESS) {
+		return ret;
+	}
+	return LDB_SUCCESS;
+}
+
+/*
   pre-open the key databases. This saves a lot of time in child
   processes
  */
@@ -262,6 +297,13 @@ static int prime_ldb_databases(struct tevent_context *event_ctx, bool *am_backup
 		talloc_free(db_context);
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
+
+	ret = handle_inplace_db_upgrade(ldb_ctx);
+	if (ret != LDB_SUCCESS) {
+		talloc_free(db_context);
+		return ret;
+	}
+
 	pdb = privilege_connect(db_context, cmdline_lp_ctx);
 	if (pdb == NULL) {
 		talloc_free(db_context);
diff --git a/source4/torture/smb2/acls.c b/source4/torture/smb2/acls.c
index 6178e21..7bccce8 100644
--- a/source4/torture/smb2/acls.c
+++ b/source4/torture/smb2/acls.c
@@ -2364,6 +2364,557 @@ done:
 }
 
 /*
+ * test Owner Rights, S-1-3-4
+ */
+static bool test_owner_rights(struct torture_context *tctx,
+			      struct smb2_tree *tree)
+{
+	const char *fname = BASEDIR "\\owner_right.txt";
+	struct smb2_create cr;
+	struct smb2_handle handle = {{0}};
+	union smb_fileinfo gi;
+	union smb_setfileinfo si;
+	struct security_descriptor *sd_orig = NULL;
+	struct security_descriptor *sd = NULL;
+	const char *owner_sid = NULL;
+	NTSTATUS mxac_status;
+	NTSTATUS status;
+	bool ret = true;
+
+	smb2_deltree(tree, BASEDIR);
+
+	ret = smb2_util_setup_dir(tctx, tree, BASEDIR);
+	torture_assert_goto(tctx, ret, ret, done,
+			    "smb2_util_setup_dir failed\n");
+
+	torture_comment(tctx, "TESTING OWNER RIGHTS\n");
+
+	cr = (struct smb2_create) {
+		.in.desired_access = SEC_STD_READ_CONTROL |
+			SEC_STD_WRITE_DAC |SEC_STD_WRITE_OWNER,
+		.in.file_attributes = FILE_ATTRIBUTE_NORMAL,
+		.in.share_access = NTCREATEX_SHARE_ACCESS_MASK,
+		.in.create_disposition = NTCREATEX_DISP_OPEN_IF,
+		.in.impersonation_level = NTCREATEX_IMPERSONATION_ANONYMOUS,
+		.in.fname = fname,
+	};
+
+	status = smb2_create(tree, tctx, &cr);
+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+					"smb2_create failed\n");
+	handle = cr.out.file.handle;
+
+	torture_comment(tctx, "get the original sd\n");
+
+	gi = (union smb_fileinfo) {
+		.query_secdesc.level = RAW_FILEINFO_SEC_DESC,
+		.query_secdesc.in.file.handle = handle,
+		.query_secdesc.in.secinfo_flags = SECINFO_DACL|SECINFO_OWNER,
+	};
+
+	status = smb2_getinfo_file(tree, tctx, &gi);
+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+					"smb2_getinfo_file failed\n");
+
+	sd_orig = gi.query_secdesc.out.sd;
+	owner_sid = dom_sid_string(tctx, sd_orig->owner_sid);
+
+	/*
+	 * Add a 2 element ACL
+	 * SEC_RIGHTS_FILE_READ for the owner,
+	 * SEC_FILE_WRITE_DATA for SID_OWNER_RIGHTS.
+	 *
+	 * Proves that the owner and SID_OWNER_RIGHTS
+	 * ACE entries are additive.
+	 */
+	sd = security_descriptor_dacl_create(tctx, 0, NULL, NULL,
+					     owner_sid,
+					     SEC_ACE_TYPE_ACCESS_ALLOWED,
+					     SEC_RIGHTS_FILE_READ,
+					     0,
+					     SID_OWNER_RIGHTS,
+					     SEC_ACE_TYPE_ACCESS_ALLOWED,
+					     SEC_FILE_WRITE_DATA,
+					     0,
+					     NULL);
+	torture_assert_not_null_goto(tctx, sd, ret, done,
+				     "SD create failed\n");
+
+	si = (union smb_setfileinfo) {
+		.set_secdesc.level = RAW_SFILEINFO_SEC_DESC,
+		.set_secdesc.in.file.handle = handle,
+		.set_secdesc.in.secinfo_flags = SECINFO_DACL,
+		.set_secdesc.in.sd = sd,
+	};
+
+	status = smb2_setinfo_file(tree, &si);
+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+					"smb2_setinfo_file failed\n");
+
+	status = smb2_util_close(tree, handle);
+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+					"smb2_util_close failed\n");
+	ZERO_STRUCT(handle);
+
+	cr = (struct smb2_create) {
+		.in.desired_access = SEC_STD_READ_CONTROL,
+		.in.file_attributes = FILE_ATTRIBUTE_NORMAL,
+		.in.share_access = NTCREATEX_SHARE_ACCESS_MASK,
+		.in.create_disposition = NTCREATEX_DISP_OPEN_IF,
+		.in.impersonation_level = NTCREATEX_IMPERSONATION_ANONYMOUS,
+		.in.query_maximal_access = true,
+		.in.fname = fname,
+	};
+
+	status = smb2_create(tree, tctx, &cr);
+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+					"smb2_setinfo_file failed\n");
+	handle = cr.out.file.handle;
+
+	mxac_status = NT_STATUS(cr.out.maximal_access_status);
+	torture_assert_ntstatus_ok_goto(tctx, mxac_status, ret, done,
+					"smb2_setinfo_file failed\n");
+
+	/*
+	 * For some reasons Windows 2016 doesn't set SEC_STD_DELETE but we
+	 * do. Mask it out so the test passes against Samba and Windows.
+	 */
+	torture_assert_int_equal_goto(tctx,
+				      cr.out.maximal_access & ~SEC_STD_DELETE,
+				      SEC_RIGHTS_FILE_READ |
+				      SEC_FILE_WRITE_DATA,
+				      ret, done,
+				      "Wrong maximum access\n");
+
+	status = smb2_util_close(tree, handle);
+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+					"smb2_util_close failed\n");
+	ZERO_STRUCT(handle);
+
+done:
+	if (!smb2_util_handle_empty(handle)) {
+		smb2_util_close(tree, handle);
+	}
+	smb2_deltree(tree, BASEDIR);
+	return ret;
+}
+
+/*
+ * test Owner Rights with a leading DENY ACE, S-1-3-4
+ */
+static bool test_owner_rights_deny(struct torture_context *tctx,
+				struct smb2_tree *tree)
+{
+	const char *fname = BASEDIR "\\owner_right_deny.txt";
+	struct smb2_create cr;
+	struct smb2_handle handle = {{0}};
+	union smb_fileinfo gi;
+	union smb_setfileinfo si;
+	struct security_descriptor *sd_orig = NULL;
+	struct security_descriptor *sd = NULL;
+	const char *owner_sid = NULL;
+	NTSTATUS mxac_status;
+	NTSTATUS status;
+	bool ret = true;
+
+	smb2_deltree(tree, BASEDIR);
+
+	ret = smb2_util_setup_dir(tctx, tree, BASEDIR);
+	torture_assert_goto(tctx, ret, ret, done,
+			"smb2_util_setup_dir failed\n");
+
+	torture_comment(tctx, "TESTING OWNER RIGHTS DENY\n");
+
+	cr = (struct smb2_create) {
+		.in.desired_access = SEC_STD_READ_CONTROL |
+			SEC_STD_WRITE_DAC |SEC_STD_WRITE_OWNER,
+		.in.file_attributes = FILE_ATTRIBUTE_NORMAL,
+		.in.share_access = NTCREATEX_SHARE_ACCESS_MASK,
+		.in.create_disposition = NTCREATEX_DISP_OPEN_IF,
+		.in.impersonation_level = NTCREATEX_IMPERSONATION_ANONYMOUS,
+		.in.fname = fname,
+	};
+
+	status = smb2_create(tree, tctx, &cr);
+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+					"smb2_create failed\n");
+	handle = cr.out.file.handle;
+
+	torture_comment(tctx, "get the original sd\n");
+
+	gi = (union smb_fileinfo) {
+		.query_secdesc.level = RAW_FILEINFO_SEC_DESC,
+		.query_secdesc.in.file.handle = handle,
+		.query_secdesc.in.secinfo_flags = SECINFO_DACL|SECINFO_OWNER,
+	};
+
+	status = smb2_getinfo_file(tree, tctx, &gi);
+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+				"smb2_getinfo_file failed\n");
+
+	sd_orig = gi.query_secdesc.out.sd;
+	owner_sid = dom_sid_string(tctx, sd_orig->owner_sid);
+
+	/*
+	 * Add a 2 element ACL
+	 * DENY SEC_FILE_DATA_READ for SID_OWNER_RIGHTS
+	 * SEC_FILE_READ_DATA for the owner.
+	 *
+	 * Proves that the owner and SID_OWNER_RIGHTS
+	 * ACE entries are additive.
+	 */
+	sd = security_descriptor_dacl_create(tctx, 0, NULL, NULL,
+					SID_OWNER_RIGHTS,
+					SEC_ACE_TYPE_ACCESS_DENIED,
+					SEC_FILE_READ_DATA,
+					0,
+					owner_sid,
+					SEC_ACE_TYPE_ACCESS_ALLOWED,
+					SEC_RIGHTS_FILE_READ,
+					0,
+					NULL);
+	torture_assert_not_null_goto(tctx, sd, ret, done,
+					"SD create failed\n");
+
+	si = (union smb_setfileinfo) {
+		.set_secdesc.level = RAW_SFILEINFO_SEC_DESC,
+		.set_secdesc.in.file.handle = handle,
+		.set_secdesc.in.secinfo_flags = SECINFO_DACL,
+		.set_secdesc.in.sd = sd,
+	};
+