summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 14:40:46 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 16:03:26 +0200
commit4a514d2261b7528696f96bb29717fb7a20708869 (patch)
tree6864687502689c10b889993882729f249cd9adf9
parent99b2da4504307b6eefc6afbd502d931d29625ea0 (diff)
downloadsamba-4a514d2261b7528696f96bb29717fb7a20708869.tar.gz
samba-4a514d2261b7528696f96bb29717fb7a20708869.tar.bz2
samba-4a514d2261b7528696f96bb29717fb7a20708869.zip
s3: Lift the smbd_messaging_context from construct_printer_info7
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 9341809128..7ec0162f1a 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -3740,6 +3740,7 @@ static WERROR construct_printer_info6(TALLOC_CTX *mem_ctx,
********************************************************************/
static WERROR construct_printer_info7(TALLOC_CTX *mem_ctx,
+ struct messaging_context *msg_ctx,
Printer_entry *print_hnd,
struct spoolss_PrinterInfo7 *r,
int snum)
@@ -3755,8 +3756,7 @@ static WERROR construct_printer_info7(TALLOC_CTX *mem_ctx,
return WERR_NOMEM;
}
- if (is_printer_published(mem_ctx, server_info,
- smbd_messaging_context(),
+ if (is_printer_published(mem_ctx, server_info, msg_ctx,
print_hnd->servername,
lp_servicename(snum), &guid, NULL)) {
r->guid = talloc_strdup_upper(mem_ctx, GUID_string2(mem_ctx, &guid));
@@ -4295,7 +4295,8 @@ WERROR _spoolss_GetPrinter(struct pipes_struct *p,
&r->out.info->info6, snum);
break;
case 7:
- result = construct_printer_info7(p->mem_ctx, Printer,
+ result = construct_printer_info7(p->mem_ctx, p->msg_ctx,
+ Printer,
&r->out.info->info7, snum);
break;
case 8: