diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-08 17:30:57 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-08 18:09:39 +0200 |
| commit | 35c39b07cc4d284b8e6af5212c4d602909ac6f30 (patch) | |
| tree | 44aed0d25cd53092593dd8f17b39cc1c46698c29 | |
| parent | 73a5c2d02d5f768a952a219b5c62231b0f9af75b (diff) | |
| download | samba-35c39b07cc4d284b8e6af5212c4d602909ac6f30.tar.gz samba-35c39b07cc4d284b8e6af5212c4d602909ac6f30.tar.bz2 samba-35c39b07cc4d284b8e6af5212c4d602909ac6f30.zip | |
s3: Lift the server_messaging_context from construct_printer_info2
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 7 |
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 94c3249f77..733307df56 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -3621,6 +3621,7 @@ static WERROR construct_printer_info1(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR construct_printer_info2(TALLOC_CTX *mem_ctx, + struct messaging_context *msg_ctx, const struct spoolss_PrinterInfo2 *info2, struct spoolss_PrinterInfo2 *r, int snum) @@ -3628,7 +3629,7 @@ static WERROR construct_printer_info2(TALLOC_CTX *mem_ctx, int count; print_status_struct status; - count = print_queue_length(server_messaging_context(), snum, &status); + count = print_queue_length(msg_ctx, snum, &status); r->servername = talloc_strdup(mem_ctx, info2->servername); W_ERROR_HAVE_NO_MEMORY(r->servername); @@ -3906,7 +3907,7 @@ static WERROR enum_all_printers_info_level(TALLOC_CTX *mem_ctx, &info[count].info1, snum); break; case 2: - result = construct_printer_info2(info, info2, + result = construct_printer_info2(info, msg_ctx, info2, &info[count].info2, snum); break; case 4: @@ -4314,7 +4315,7 @@ WERROR _spoolss_GetPrinter(struct pipes_struct *p, &r->out.info->info1, snum); break; case 2: - result = construct_printer_info2(p->mem_ctx, info2, + result = construct_printer_info2(p->mem_ctx, p->msg_ctx, info2, &r->out.info->info2, snum); break; case 3: |