diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-05 18:01:04 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-05 18:01:04 +0100 |
| commit | 37e6849d451c4f49c6a0c96a78a5ef81baab83d4 (patch) | |
| tree | d1e443f66fa367340ef04d39349e50e7100b9b5f /source3/printing | |
| parent | de7dc2cec059305d28cc75a5347bfd88f3cb5c95 (diff) | |
| parent | 0581094023ba5e561184a2ea57f6e905161de978 (diff) | |
| download | samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.tar.gz samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.tar.bz2 samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/notify.c | 3 | ||||
| -rw-r--r-- | source3/printing/print_cups.c | 3 | ||||
| -rw-r--r-- | source3/printing/printing.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source3/printing/notify.c b/source3/printing/notify.c index b24a8a52f5..860a400d64 100644 --- a/source3/printing/notify.c +++ b/source3/printing/notify.c @@ -221,7 +221,7 @@ void print_notify_send_messages(struct messaging_context *msg_ctx, static void print_notify_event_send_messages(struct event_context *event_ctx, struct timed_event *te, - const struct timeval *now, + struct timeval now, void *private_data) { /* Remove this timed event handler. */ @@ -326,7 +326,6 @@ to notify_queue_head\n", msg->type, msg->field, msg->printer)); /* Add an event for 1 second's time to send this queue. */ notify_event = event_add_timed(smbd_event_context(), NULL, timeval_current_ofs(1,0), - "print_notify", print_notify_event_send_messages, NULL); } diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index 5fb1d379a6..d75d635779 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -425,7 +425,8 @@ static bool cups_pcap_load_async(int *pfd) } /* Child. */ - if (!reinit_after_fork(smbd_messaging_context(), true)) { + if (!reinit_after_fork(smbd_messaging_context(), + smbd_event_context(), true)) { DEBUG(0,("cups_pcap_load_async: reinit_after_fork() failed\n")); smb_panic("cups_pcap_load_async: reinit_after_fork() failed"); } diff --git a/source3/printing/printing.c b/source3/printing/printing.c index ba88f8ee56..0f38aeab80 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -1421,7 +1421,8 @@ void start_background_queue(void) close(pause_pipe[0]); pause_pipe[0] = -1; - if (!reinit_after_fork(smbd_messaging_context(), true)) { + if (!reinit_after_fork(smbd_messaging_context(), + smbd_event_context(), true)) { DEBUG(0,("reinit_after_fork() failed\n")); smb_panic("reinit_after_fork() failed"); } |