Fix bug #5688 LPQ process is orphaned if socket address parameter is invalid

[abartlet/samba.git/.git] / source3 / printing / printing.c

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 4051a6ca3422b19ac9057a1e1b02f2ed46972562..ba88f8ee566fe5f19559bed78f9a115e083bbbee 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -1394,7 +1394,19 @@ main thread of the background lpq updater
 ****************************************************************************/
 void start_background_queue(void)
 {
+       /* Use local variables for this as we don't
+        * need to save the parent side of this, just
+        * ensure it closes when the process exits.
+        */
+       int pause_pipe[2];
+
        DEBUG(3,("start_background_queue: Starting background LPQ thread\n"));
+
+       if (pipe(pause_pipe) == -1) {
+               DEBUG(5,("start_background_queue: cannot create pipe. %s\n", strerror(errno) ));
+               exit(1);
+       }
+
        background_lpq_updater_pid = sys_fork();
 
        if (background_lpq_updater_pid == -1) {
@@ -1406,6 +1418,9 @@ void start_background_queue(void)
                /* Child. */
                DEBUG(5,("start_background_queue: background LPQ thread started\n"));
 
+               close(pause_pipe[0]);
+               pause_pipe[0] = -1;
+
                if (!reinit_after_fork(smbd_messaging_context(), true)) {
                        DEBUG(0,("reinit_after_fork() failed\n"));
                        smb_panic("reinit_after_fork() failed");
@@ -1420,13 +1435,23 @@ void start_background_queue(void)
 
                messaging_register(smbd_messaging_context(), NULL,
                                   MSG_PRINTER_UPDATE, print_queue_receive);
-               
+
                DEBUG(5,("start_background_queue: background LPQ thread waiting for messages\n"));
                while (1) {
-                       pause();
-                       
+                       fd_set pause_fds;
+                       int pause_select;
+
+                       FD_ZERO(&pause_fds);
+                       FD_SET(pause_pipe[1], &pause_fds);
+                       pause_select = sys_select(pause_pipe[1]+1, &pause_fds, NULL, NULL, NULL);
+                       /* If pause_pipe[0] is closed it means the parent smbd
+                        * and children exited or aborted. */
+                       if (pause_select == 1) {
+                                exit_server_cleanly(NULL);
+                       }
+
                        /* check for some essential signals first */
-                       
+
                         if (got_sig_term) {
                                 exit_server_cleanly(NULL);
                         }
@@ -1437,9 +1462,9 @@ void start_background_queue(void)
                                 reload_services(False);
                                 reload_after_sighup = 0;
                         }
-                       
+
                        /* now check for messages */
-                       
+
                        DEBUG(10,("start_background_queue: background LPQ thread got a message\n"));
                        message_dispatch(smbd_messaging_context());
 
@@ -1449,6 +1474,8 @@ void start_background_queue(void)
                                                   0);
                }
        }
+
+       close(pause_pipe[1]);
 }
 
 /****************************************************************************