summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 17:02:24 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 18:09:37 +0200
commit8b6d88854c55553fce59aa8956d025b16f513a25 (patch)
treebd8036a323b6183874aebbe19804c08963ae0d01
parent0b423493c30ca291ed09c9c2fc288d59635e79df (diff)
downloadsamba-8b6d88854c55553fce59aa8956d025b16f513a25.tar.gz
samba-8b6d88854c55553fce59aa8956d025b16f513a25.tar.bz2
samba-8b6d88854c55553fce59aa8956d025b16f513a25.zip
s3: Lift the server_messaging_context from print_unix_job
-rw-r--r--source3/printing/printing.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 142d26fc46..753d7e72c4 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -754,7 +754,10 @@ static void pjob_delete(struct tevent_context *ev,
List a unix job in the print database.
****************************************************************************/
-static void print_unix_job(const char *sharename, print_queue_struct *q, uint32 jobid)
+static void print_unix_job(struct tevent_context *ev,
+ struct messaging_context *msg_ctx,
+ const char *sharename, print_queue_struct *q,
+ uint32 jobid)
{
struct printjob pj, *old_pj;
@@ -785,8 +788,7 @@ static void print_unix_job(const char *sharename, print_queue_struct *q, uint32
fstrcpy(pj.user, old_pj ? old_pj->user : q->fs_user);
fstrcpy(pj.queuename, old_pj ? old_pj->queuename : sharename );
- pjob_store(server_event_context(), server_messaging_context(),
- sharename, jobid, &pj);
+ pjob_store(ev, msg_ctx, sharename, jobid, &pj);
}
@@ -1277,7 +1279,9 @@ static void print_queue_update_internal( const char *sharename,
if (jobid == (uint32)-1) {
/* assume its a unix print job */
- print_unix_job(sharename, &queue[i], jobid);
+ print_unix_job(server_event_context(),
+ server_messaging_context(),
+ sharename, &queue[i], jobid);
continue;
}
@@ -1287,7 +1291,9 @@ static void print_queue_update_internal( const char *sharename,
/* err, somethings wrong. Probably smbd was restarted
with jobs in the queue. All we can do is treat them
like unix jobs. Pity. */
- print_unix_job(sharename, &queue[i], jobid);
+ print_unix_job(server_event_context(),
+ server_messaging_context(),
+ sharename, &queue[i], jobid);
continue;
}