The branch, master has been updated
via 455bbd5 s3-spoolss: Fixed print job access.
via b3fd5e1 s3-spoolss: Fixed print_access_check server_info.
from 100843a s3:smbd: Increase unsupported IOCTL debug message to 2
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 455bbd5e1e21e3d295b84ee6895097ff420c3d20
Author: Andreas Schneider <[email protected]>
Date: Fri Oct 1 21:18:13 2010 +0200
s3-spoolss: Fixed print job access.
commit b3fd5e11e5c380e040d3fd208a1c904404b82c43
Author: Andreas Schneider <[email protected]>
Date: Fri Oct 1 21:03:15 2010 +0200
s3-spoolss: Fixed print_access_check server_info.
-----------------------------------------------------------------------
Summary of changes:
source3/printing/nt_printing.c | 2 +-
source3/rpc_server/srv_spoolss_nt.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index b12d2b9..59af598 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -2102,7 +2102,7 @@ bool print_access_check(const struct
auth_serversupplied_info *server_info,
}
result = winreg_get_printer_secdesc(mem_ctx,
- server_info,
+ get_server_info_system(),
msg_ctx,
pname,
&secdesc);
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index bb3b05d..07733bd 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -1823,7 +1823,7 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p,
if (!user_ok_token(uidtoname(p->server_info->utok.uid), NULL,
p->server_info->ptok, snum) ||
- !print_access_check(get_server_info_system(),
+ !print_access_check(p->server_info,
p->msg_ctx,
snum,
r->in.access_mask)) {
@@ -5637,7 +5637,7 @@ WERROR _spoolss_StartDocPrinter(struct pipes_struct *p,
return WERR_BADFID;
}
- werr = print_job_start(get_server_info_system(),
+ werr = print_job_start(p->server_info,
p->msg_ctx,
p->client_id->name,
snum,
@@ -5740,7 +5740,7 @@ WERROR _spoolss_WritePrinter(struct pipes_struct *p,
static WERROR control_printer(struct policy_handle *handle, uint32_t command,
struct pipes_struct *p)
{
- const struct auth_serversupplied_info *server_info =
get_server_info_system();
+ const struct auth_serversupplied_info *server_info = p->server_info;
int snum;
WERROR errcode = WERR_BADFUNC;
struct printer_handle *Printer = find_printer_index_by_hnd(p, handle);
@@ -5799,7 +5799,7 @@ WERROR _spoolss_AbortPrinter(struct pipes_struct *p,
return WERR_SPL_NO_STARTDOC;
}
- errcode = print_job_delete(get_server_info_system(),
+ errcode = print_job_delete(p->server_info,
p->msg_ctx,
snum,
Printer->jobid);
@@ -7084,7 +7084,7 @@ static WERROR spoolss_setjob_1(TALLOC_CTX *mem_ctx,
WERROR _spoolss_SetJob(struct pipes_struct *p,
struct spoolss_SetJob *r)
{
- const struct auth_serversupplied_info *server_info =
get_server_info_system();
+ const struct auth_serversupplied_info *server_info = p->server_info;
int snum;
WERROR errcode = WERR_BADFUNC;
@@ -7796,7 +7796,7 @@ static WERROR spoolss_addprinterex_level_2(struct
pipes_struct *p,
}
/* you must be a printer admin to add a new printer */
- if (!print_access_check(get_server_info_system(),
+ if (!print_access_check(p->server_info,
p->msg_ctx,
snum,
PRINTER_ACCESS_ADMINISTER)) {
--
Samba Shared Repository
