Attachment 5818 Details for Bug 7541 – patch for 3.4

[patch] patch for 3.4

v3-4-test.patch (text/plain), 3.96 KB, created by Guenther Deschner on 2010-07-01 07:22:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2010-07-01 07:22:29 UTC

Size: 3.96 KB

patch

obsolete

>From ebd269652bb5f6bffd726d67d81d7dd96e4878e9 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Thu, 1 Jul 2010 13:58:56 +0200
>Subject: [PATCH] s3-printing: Fix Bug #7541, %D in "printer admin" causing smbd crash.
>
>Guenther
>---
> source3/printing/nt_printing.c      |    4 +++-
> source3/rpc_server/srv_spoolss_nt.c |   22 +++++++++++++++-------
> 2 files changed, 18 insertions(+), 8 deletions(-)
>
>diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
>index 678a8c5..41708e6 100644
>--- a/source3/printing/nt_printing.c
>+++ b/source3/printing/nt_printing.c
>@@ -5738,7 +5738,9 @@ bool print_access_check(struct auth_serversupplied_info *server_info, int snum,
> 
>         if (!NT_STATUS_IS_OK(status) &&
> 	    (token_contains_name_in_list(uidtoname(server_info->utok.uid),
>-					 NULL, NULL, server_info->ptok,
>+					 pdb_get_domain(server_info->sam_account),
>+					 NULL,
>+					 server_info->ptok,
> 					 lp_printer_admin(snum)))) {
> 		talloc_destroy(mem_ctx);
> 		return True;
>diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
>index ea81fae..4b75d7c 100644
>--- a/source3/rpc_server/srv_spoolss_nt.c
>+++ b/source3/rpc_server/srv_spoolss_nt.c
>@@ -1642,7 +1642,8 @@ WERROR _spoolss_OpenPrinterEx(pipes_struct *p,
> 						 &se_printop ) &&
> 			    !token_contains_name_in_list(
> 				    uidtoname(p->server_info->utok.uid),
>-				    NULL, NULL,
>+				    pdb_get_domain(p->server_info->sam_account),
>+				    NULL,
> 				    p->server_info->ptok,
> 				    lp_printer_admin(snum))) {
> 				close_printer_handle(p, r->out.handle);
>@@ -2122,8 +2123,10 @@ WERROR _spoolss_DeletePrinterDriver(pipes_struct *p,
> 	if ( (p->server_info->utok.uid != sec_initial_uid())
> 		&& !user_has_privileges(p->server_info->ptok, &se_printop )
> 		&& !token_contains_name_in_list(
>-			uidtoname(p->server_info->utok.uid), NULL,
>-			NULL, p->server_info->ptok,
>+			uidtoname(p->server_info->utok.uid),
>+			pdb_get_domain(p->server_info->sam_account),
>+			NULL,
>+			p->server_info->ptok,
> 			lp_printer_admin(-1)) )
> 	{
> 		return WERR_ACCESS_DENIED;
>@@ -2222,7 +2225,9 @@ WERROR _spoolss_DeletePrinterDriverEx(pipes_struct *p,
> 	if ( (p->server_info->utok.uid != sec_initial_uid())
> 		&& !user_has_privileges(p->server_info->ptok, &se_printop )
> 		&& !token_contains_name_in_list(
>-			uidtoname(p->server_info->utok.uid), NULL, NULL,
>+			uidtoname(p->server_info->utok.uid),
>+			pdb_get_domain(p->server_info->sam_account),
>+			NULL,
> 			p->server_info->ptok, lp_printer_admin(-1)) )
> 	{
> 		return WERR_ACCESS_DENIED;
>@@ -8214,7 +8219,8 @@ WERROR _spoolss_AddForm(pipes_struct *p,
> 	if ((p->server_info->utok.uid != sec_initial_uid()) &&
> 	     !user_has_privileges(p->server_info->ptok, &se_printop) &&
> 	     !token_contains_name_in_list(uidtoname(p->server_info->utok.uid),
>-					  NULL, NULL,
>+					  pdb_get_domain(p->server_info->sam_account),
>+					  NULL,
> 					  p->server_info->ptok,
> 					  lp_printer_admin(snum))) {
> 		DEBUG(2,("_spoolss_Addform: denied by insufficient permissions.\n"));
>@@ -8295,7 +8301,8 @@ WERROR _spoolss_DeleteForm(pipes_struct *p,
> 	if ((p->server_info->utok.uid != sec_initial_uid()) &&
> 	     !user_has_privileges(p->server_info->ptok, &se_printop) &&
> 	     !token_contains_name_in_list(uidtoname(p->server_info->utok.uid),
>-					  NULL, NULL,
>+					  pdb_get_domain(p->server_info->sam_account),
>+					  NULL,
> 					  p->server_info->ptok,
> 					  lp_printer_admin(snum))) {
> 		DEBUG(2,("_spoolss_DeleteForm: denied by insufficient permissions.\n"));
>@@ -8378,7 +8385,8 @@ WERROR _spoolss_SetForm(pipes_struct *p,
> 	if ((p->server_info->utok.uid != sec_initial_uid()) &&
> 	     !user_has_privileges(p->server_info->ptok, &se_printop) &&
> 	     !token_contains_name_in_list(uidtoname(p->server_info->utok.uid),
>-					  NULL, NULL,
>+					  pdb_get_domain(p->server_info->sam_account),
>+					  NULL,
> 					  p->server_info->ptok,
> 					  lp_printer_admin(snum))) {
> 		DEBUG(2,("_spoolss_Setform: denied by insufficient permissions.\n"));
>-- 
>1.6.6.1
>

Flags:

bjacke: review+
vl: review+

Actions: View

Attachments on bug 7541: 5817 | 5818