diff options
| author | Volker Lendecke <vl@samba.org> | 2010-07-04 16:28:13 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-07-04 17:29:23 +0200 |
| commit | 7f0e6df88345c1154f19fd263966ad20c73f5d52 (patch) | |
| tree | 683ecaec64b2ed779300d038a9e70bdc7dbf8f63 /source3/printing | |
| parent | 5a3c64668a33fc3fa8f87a78d06fa040eed9f8f8 (diff) | |
| download | samba-7f0e6df88345c1154f19fd263966ad20c73f5d52.tar.gz samba-7f0e6df88345c1154f19fd263966ad20c73f5d52.tar.bz2 samba-7f0e6df88345c1154f19fd263966ad20c73f5d52.zip | |
s3: Pass the new server_id through reinit_after_fork
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/print_cups.c | 7 | ||||
| -rw-r--r-- | source3/printing/printing.c | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index 043cc96930..cbefa07a33 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -397,6 +397,7 @@ static bool cups_pcap_load_async(int *pfd) { int fds[2]; pid_t pid; + NTSTATUS status; *pfd = -1; @@ -434,8 +435,10 @@ static bool cups_pcap_load_async(int *pfd) close_all_print_db(); - if (!NT_STATUS_IS_OK(reinit_after_fork(server_messaging_context(), - server_event_context(), true))) { + status = reinit_after_fork(server_messaging_context(), + server_event_context(), procid_self(), + true); + if (!NT_STATUS_IS_OK(status)) { 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 93624f0f78..1b5decc696 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -1430,6 +1430,7 @@ void start_background_queue(void) if(background_lpq_updater_pid == 0) { struct tevent_fd *fde; int ret; + NTSTATUS status; /* Child. */ DEBUG(5,("start_background_queue: background LPQ thread started\n")); @@ -1437,9 +1438,11 @@ void start_background_queue(void) close(pause_pipe[0]); pause_pipe[0] = -1; - if (!NT_STATUS_IS_OK(reinit_after_fork(server_messaging_context(), - server_event_context(), - true))) { + status = reinit_after_fork(server_messaging_context(), + server_event_context(), + procid_self(), true); + + if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("reinit_after_fork() failed\n")); smb_panic("reinit_after_fork() failed"); } |