diff --git a/trunk/0001-s3-spoolss-Make-parameters-in-call-to-user_ok_token-.patch b/trunk/0001-s3-spoolss-Make-parameters-in-call-to-user_ok_token-.patch
new file mode 100644
index 0000000..9cc9411
--- /dev/null
+++ b/trunk/0001-s3-spoolss-Make-parameters-in-call-to-user_ok_token-.patch
@@ -0,0 +1,39 @@
+From 1b3e507645e1e250e48acc3be58375f921420f68 Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra@samba.org>
+Date: Thu, 5 Nov 2020 15:48:08 -0800
+Subject: [PATCH] s3: spoolss: Make parameters in call to user_ok_token() match
+ all other uses.
+
+We already have p->session_info->unix_info->unix_name, we don't
+need to go through a legacy call to uidtoname(p->session_info->unix_token->uid).
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=14568
+
+Signed-off-by: Jeremy Allison <jra@samba.org>
+Reviewed-by: Andrew Bartlett <abartlet@samba.org>
+
+Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
+Autobuild-Date(master): Mon Nov  9 04:10:45 UTC 2020 on sn-devel-184
+
+(cherry picked from commit e5e1759057a767f517bf480a2172a36623df2799)
+---
+ source3/rpc_server/spoolss/srv_spoolss_nt.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
+index 8b6a803a910..10c1b1d54f2 100644
+--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
++++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
+@@ -1880,7 +1880,8 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p,
+ 			return WERR_ACCESS_DENIED;
+ 		}
+ 
+-		if (!user_ok_token(uidtoname(p->session_info->unix_token->uid), NULL,
++		if (!user_ok_token(p->session_info->unix_info->unix_name,
++				   p->session_info->info->domain_name,
+ 				   p->session_info->security_token, snum) ||
+ 		    !W_ERROR_IS_OK(print_access_check(p->session_info,
+ 						      p->msg_ctx,
+-- 
+2.27.0
+
diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 6fe49cb..1fd4d27 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -26,15 +26,22 @@ optdepends=(
 source=(https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar{.gz,.asc}
         samba.logrotate
         samba.pam
-        samba.conf)
+        samba.conf
+        0001-s3-spoolss-Make-parameters-in-call-to-user_ok_token-.patch)
 validpgpkeys=('52FBC0B86D954B0843324CDC6F33915B6568B7EA') #Samba Distribution Verification Key <samba-bugs@samba.org>
 sha512sums=('60b8597b7fad13dd55ffec4c750ee4f5f39220d8e8d52232d3a8c4d830a5ff29254716a7230b0182e0717585e5a34b01373527caecd1d32f2170c6063a97d070'
             'SKIP'
             '2ba0691ded467e4d6e40821f6de58c00f8962209efe2e60284c0c87756ab471c22c3d63b77d506e48c90ed0d852a2a24e41be1d499cf74a73cb99da0b503c858'
             '1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67'
-            'e46ee848baabb261e7468ecee43aba4d001a24f86f5322ae522abdb75030fd0ebd9063b9df0be3576c4d1654d81331f5e389aee16ec2fa138259ae4728e94efc')
+            'e46ee848baabb261e7468ecee43aba4d001a24f86f5322ae522abdb75030fd0ebd9063b9df0be3576c4d1654d81331f5e389aee16ec2fa138259ae4728e94efc'
+            'd166fec6ad99cf095f84024860bbfed1f91dd8e61be71b09a4925dc1bc12f7f4baada6c314cc96bf74b1afa12eb42066eaa6879dfb5399e83d35bfbc34af8824')
 ### UNINSTALL dmapi package before building!!!
 
+prepare() {
+  cd samba-${pkgver}
+  patch -p1 -i ../0001-s3-spoolss-Make-parameters-in-call-to-user_ok_token-.patch
+}
+
 build() {
   # Use samba-pkg as a staging directory for the split packages
   # (This is so RPATHS and symlinks are generated correctly via