Attachment 16331 Details for Bug 14568 – git-am fix for 4.12.next, 4.13.next.

[patch] git-am fix for 4.12.next, 4.13.next.

0001-s3-spoolss-Make-parameters-in-call-to-user_ok_token-.patch (text/plain), 1.49 KB, created by Jeremy Allison on 2020-11-09 18:53:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2020-11-09 18:53:20 UTC

Size: 1.49 KB

patch

obsolete

>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
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 14568: 16325 | 16326 | 16327 | 16328 | 16331