diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-08 17:09:00 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-08 18:09:37 +0200 |
| commit | 3b5b74c7dd931815e7b3763ad1cbf47c3710f60d (patch) | |
| tree | 9ba510d10c5d6ad5136bf046de2d474530c7c012 /source3/printing | |
| parent | c2894503d1c66504e74f378141a9cfb221091c63 (diff) | |
| download | samba-3b5b74c7dd931815e7b3763ad1cbf47c3710f60d.tar.gz samba-3b5b74c7dd931815e7b3763ad1cbf47c3710f60d.tar.bz2 samba-3b5b74c7dd931815e7b3763ad1cbf47c3710f60d.zip | |
s3: Lift the server_messaging_context from print_queue_update_with_lock
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/printing.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c index ac2e9a2826..fe87b9bf6c 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -1378,7 +1378,9 @@ static void print_queue_update_internal( struct tevent_context *ev, smbd processes maytry to update the lpq cache concurrently). ****************************************************************************/ -static void print_queue_update_with_lock( const char *sharename, +static void print_queue_update_with_lock( struct tevent_context *ev, + struct messaging_context *msg_ctx, + const char *sharename, struct printif *current_printif, char *lpq_command, char *lprm_command ) { @@ -1447,8 +1449,7 @@ static void print_queue_update_with_lock( const char *sharename, /* do the main work now */ - print_queue_update_internal(server_event_context(), - server_messaging_context(), + print_queue_update_internal(ev, msg_ctx, sharename, current_printif, lpq_command, lprm_command); @@ -1484,7 +1485,7 @@ static void print_queue_receive(struct messaging_context *msg, return; } - print_queue_update_with_lock(sharename, + print_queue_update_with_lock(server_event_context(), msg, sharename, get_printer_fns_from_type((enum printing_types)printing_type), lpqcommand, lprmcommand ); @@ -1677,7 +1678,9 @@ static void print_queue_update(struct messaging_context *msg_ctx, if ( force || background_lpq_updater_pid == -1 ) { DEBUG(4,("print_queue_update: updating queue [%s] myself\n", sharename)); current_printif = get_printer_fns( snum ); - print_queue_update_with_lock( sharename, current_printif, lpqcommand, lprmcommand ); + print_queue_update_with_lock(server_event_context(), msg_ctx, + sharename, current_printif, + lpqcommand, lprmcommand); return; } |