]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - scheduler/main.c
Update svn:keyword properties.
[thirdparty/cups.git] / scheduler / main.c
index 41d6d197752456b6b7677dd2ae90f009b2d9739e..5a8da815e5a99ef22127ea7106d69b0c182fc886 100644 (file)
@@ -1,9 +1,9 @@
 /*
- * "$Id: main.c 7925 2008-09-10 17:47:26Z mike $"
+ * "$Id$"
  *
- *   Scheduler main loop for the Common UNIX Printing System (CUPS).
+ *   Main loop for the CUPS scheduler.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *
  * Contents:
  *
- *   main()                    - Main entry for the CUPS scheduler.
- *   cupsdClosePipe()          - Close a pipe as necessary.
- *   cupsdOpenPipe()           - Create a pipe which is closed on exec.
- *   cupsdHoldSignals()        - Hold child and termination signals.
- *   cupsdReleaseSignals()     - Release signals for delivery.
- *   cupsdSetString()          - Set a string value.
- *   cupsdSetStringf()         - Set a formatted string value.
- *   launchd_checkin()         - Check-in with launchd and collect the
- *                               listening fds.
- *   launchd_checkout()        - Check-out with launchd.
- *   parent_handler()          - Catch USR1/CHLD signals...
- *   process_children()        - Process all dead children...
- *   sigchld_handler()         - Handle 'child' signals from old processes.
- *   sighup_handler()          - Handle 'hangup' signals to reconfigure the
- *                               scheduler.
- *   sigterm_handler()         - Handle 'terminate' signals that stop the
- *                               scheduler.
- *   select_timeout()          - Calculate the select timeout value.
- *   usage()                   - Show scheduler usage.
+ *   main()                - Main entry for the CUPS scheduler.
+ *   cupsdAddString()      - Copy and add a string to an array.
+ *   cupsdCheckProcess()   - Tell the main loop to check for dead children.
+ *   cupsdClearString()    - Clear a string.
+ *   cupsdFreeStrings()    - Free an array of strings.
+ *   cupsdHoldSignals()    - Hold child and termination signals.
+ *   cupsdReleaseSignals() - Release signals for delivery.
+ *   cupsdSetString()      - Set a string value.
+ *   cupsdSetStringf()     - Set a formatted string value.
+ *   launchd_checkin()     - Check-in with launchd and collect the listening
+ *                           fds.
+ *   launchd_checkout()    - Update the launchd KeepAlive file as needed.
+ *   parent_handler()      - Catch USR1/CHLD signals...
+ *   process_children()    - Process all dead children...
+ *   select_timeout()      - Calculate the select timeout value.
+ *   sigchld_handler()     - Handle 'child' signals from old processes.
+ *   sighup_handler()      - Handle 'hangup' signals to reconfigure the
+ *                           scheduler.
+ *   sigterm_handler()     - Handle 'terminate' signals that stop the scheduler.
+ *   usage()               - Show scheduler usage.
  */
 
 /*
 #include <sys/resource.h>
 #include <syslog.h>
 #include <grp.h>
-#include <cups/dir.h>
 
 #ifdef HAVE_LAUNCH_H
 #  include <launch.h>
 #  include <libgen.h>
-#  define CUPS_KEEPALIVE       CUPS_CACHEDIR "/org.cups.cupsd"
+#  define CUPS_KEEPALIVE CUPS_CACHEDIR "/org.cups.cupsd"
                                        /* Name of the launchd KeepAlive file */
 #  ifndef LAUNCH_JOBKEY_KEEPALIVE
 #    define LAUNCH_JOBKEY_KEEPALIVE "KeepAlive"
 #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
 #  include <malloc.h>
 #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
+
 #ifdef HAVE_NOTIFY_H
 #  include <notify.h>
 #endif /* HAVE_NOTIFY_H */
 
-#if defined(__APPLE__) && defined(HAVE_DLFCN_H)
-#  include <dlfcn.h>
-#endif /* __APPLE__ && HAVE_DLFCN_H */
+#ifdef HAVE_SYS_PARAM_H
+#  include <sys/param.h>
+#endif /* HAVE_SYS_PARAM_H */
 
 
 /*
@@ -88,7 +89,7 @@ static void           sigchld_handler(int sig);
 static void            sighup_handler(int sig);
 static void            sigterm_handler(int sig);
 static long            select_timeout(int fds);
-static void            usage(int status);
+static void            usage(int status) __attribute__((noreturn));
 
 
 /*
@@ -106,12 +107,6 @@ static int         dead_children = 0;
 static int             stop_scheduler = 0;
                                        /* Should the scheduler stop? */
 
-#if defined(__APPLE__) && defined(HAVE_DLFCN_H)
-static const char *PSQLibPath = "/usr/lib/libPrintServiceQuota.dylib";
-static const char *PSQLibFuncName = "PSQUpdateQuota";
-static void *PSQLibRef;                        /* libPrintServiceQuota.dylib */
-#endif /* HAVE_DLFCN_H */
-
 
 /*
  * 'main()' - Main entry for the CUPS scheduler.
@@ -130,23 +125,20 @@ main(int  argc,                           /* I - Number of command-line args */
   cupsd_listener_t     *lis;           /* Current listener */
   time_t               current_time,   /* Current time */
                        activity,       /* Client activity timer */
-                       browse_time,    /* Next browse send time */
                        senddoc_time,   /* Send-Document time */
                        expire_time,    /* Subscription expire time */
                        report_time,    /* Malloc/client/job report time */
-                       event_time;     /* Last time an event notification was done */
+                       event_time;     /* Last event notification time */
   long                 timeout;        /* Timeout for cupsdDoSelect() */
   struct rlimit                limit;          /* Runtime limit */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
   struct sigaction     action;         /* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-#ifdef __sgi
-  cups_file_t          *fp;            /* Fake lpsched lock file */
-  struct stat          statbuf;        /* Needed for checking lpsched FIFO */
-#endif /* __sgi */
-#ifdef __APPLE__
   int                  run_as_child = 0;
-                                       /* Needed for Mac OS X fork/exec */
+                                       /* Needed for background fork/exec */
+#ifdef __APPLE__
+  int                  use_sysman = !getuid();
+                                       /* Use system management functions? */
 #else
   time_t               netif_time = 0; /* Time since last network update */
 #endif /* __APPLE__ */
@@ -163,7 +155,7 @@ main(int  argc,                             /* I - Number of command-line args */
 
   if (getuid() != geteuid())
   {
-    fputs("cupsd: Cannot run as a setuid program!\n", stderr);
+    fputs("cupsd: Cannot run as a setuid program\n", stderr);
     return (1);
   }
 #endif /* HAVE_GETEUID */
@@ -187,18 +179,16 @@ main(int  argc,                           /* I - Number of command-line args */
       for (opt = argv[i] + 1; *opt != '\0'; opt ++)
         switch (*opt)
        {
-#ifdef __APPLE__
          case 'C' : /* Run as child with config file */
               run_as_child = 1;
              fg           = -1;
-#endif /* __APPLE__ */
 
          case 'c' : /* Configuration file */
              i ++;
              if (i >= argc)
              {
                _cupsLangPuts(stderr, _("cupsd: Expected config filename "
-                                       "after \"-c\" option!\n"));
+                                       "after \"-c\" option."));
                usage(1);
              }
 
@@ -218,7 +208,6 @@ main(int  argc,                             /* I - Number of command-line args */
 
                 char *current;         /* Current directory */
 
-
               /*
                * Allocate a buffer for the current working directory to
                * reduce run-time stack usage; this approximates the
@@ -229,14 +218,14 @@ main(int  argc,                           /* I - Number of command-line args */
                 if ((current = malloc(1024)) == NULL)
                {
                  _cupsLangPuts(stderr,
-                               _("cupsd: Unable to get current directory!\n"));
+                               _("cupsd: Unable to get current directory."));
                   return (1);
                }
 
                if (!getcwd(current, 1024))
                {
                  _cupsLangPuts(stderr,
-                               _("cupsd: Unable to get current directory!\n"));
+                               _("cupsd: Unable to get current directory."));
                   free(current);
                  return (1);
                }
@@ -264,17 +253,55 @@ main(int  argc,                           /* I - Number of command-line args */
              fg      = 1;
 #else
              _cupsLangPuts(stderr, _("cupsd: launchd(8) support not compiled "
-                                     "in, running in normal mode.\n"));
+                                     "in, running in normal mode."));
               fg = 0;
 #endif /* HAVE_LAUNCHD */
              break;
 
           case 'p' : /* Stop immediately for profiling */
-              puts("Warning: -p option is for internal testing use only!");
+              fputs("cupsd: -p (startup profiling) is for internal testing "
+                    "use only!\n", stderr);
              stop_scheduler = 1;
              fg             = 1;
              break;
 
+          case 'P' : /* Disable security profiles */
+              fputs("cupsd: -P (disable security profiles) is for internal "
+                    "testing use only!\n", stderr);
+             UseProfiles = 0;
+             break;
+
+          case 's' : /* Set cups-files.conf location */
+              i ++;
+             if (i >= argc)
+             {
+               _cupsLangPuts(stderr, _("cupsd: Expected cups-files.conf "
+                                       "filename after \"-s\" option."));
+               usage(1);
+             }
+
+              if (argv[i][0] != '/')
+             {
+              /*
+               * Relative filename not allowed...
+               */
+
+               _cupsLangPuts(stderr, _("cupsd: Relative cups-files.conf "
+                                       "filename not allowed."));
+               usage(1);
+              }
+
+             cupsdSetString(&CupsFilesFile, argv[i]);
+             break;
+
+#ifdef __APPLE__
+          case 'S' : /* Disable system management functions */
+              fputs("cupsd: -S (disable system management) for internal "
+                    "testing use only!\n", stderr);
+             use_sysman = 0;
+             break;
+#endif /* __APPLE__ */
+
           case 't' : /* Test the cupsd.conf file... */
              TestConfigFile = 1;
              fg             = 1;
@@ -282,13 +309,13 @@ main(int  argc,                           /* I - Number of command-line args */
 
          default : /* Unknown option */
               _cupsLangPrintf(stderr, _("cupsd: Unknown option \"%c\" - "
-                                       "aborting!\n"), *opt);
+                                       "aborting."), *opt);
              usage(1);
              break;
        }
     else
     {
-      _cupsLangPrintf(stderr, _("cupsd: Unknown argument \"%s\" - aborting!\n"),
+      _cupsLangPrintf(stderr, _("cupsd: Unknown argument \"%s\" - aborting."),
                       argv[i]);
       usage(1);
     }
@@ -296,6 +323,35 @@ main(int  argc,                            /* I - Number of command-line args */
   if (!ConfigurationFile)
     cupsdSetString(&ConfigurationFile, CUPS_SERVERROOT "/cupsd.conf");
 
+  if (!CupsFilesFile)
+  {
+    char       *filename,              /* Copy of cupsd.conf filename */
+               *slash;                 /* Final slash in cupsd.conf filename */
+    size_t     len;                    /* Size of buffer */
+
+    len = strlen(ConfigurationFile) + 15;
+    if ((filename = malloc(len)) == NULL)
+    {
+      _cupsLangPrintf(stderr,
+                     _("cupsd: Unable to get path to "
+                       "cups-files.conf file."));
+      return (1);
+    }
+
+    strlcpy(filename, ConfigurationFile, len);
+    if ((slash = strrchr(filename, '/')) == NULL)
+    {
+      _cupsLangPrintf(stderr,
+                     _("cupsd: Unable to get path to "
+                       "cups-files.conf file."));
+      return (1);
+    }
+
+    strlcpy(slash, "/cups-files.conf", len - (slash - filename));
+    cupsdSetString(&CupsFilesFile, filename);
+    free(filename);
+  }
+
  /*
   * If the user hasn't specified "-f", run in the background...
   */
@@ -350,28 +406,38 @@ main(int  argc,                           /* I - Number of command-line args */
       }
       else if (WIFEXITED(i))
       {
-        fprintf(stderr, "cupsd: Child exited with status %d!\n",
+        fprintf(stderr, "cupsd: Child exited with status %d\n",
                WEXITSTATUS(i));
        return (2);
       }
       else
       {
-        fprintf(stderr, "cupsd: Child exited on signal %d!\n", WTERMSIG(i));
+        fprintf(stderr, "cupsd: Child exited on signal %d\n", WTERMSIG(i));
        return (3);
       }
     }
 
-#ifdef __APPLE__
+#if defined(__OpenBSD__) && OpenBSD < 201211
+   /*
+    * Call _thread_sys_closefrom() so the child process doesn't reset the
+    * parent's file descriptors to be blocking.  This is a workaround for a
+    * limitation of userland libpthread on older versions of OpenBSD.
+    */
+
+    _thread_sys_closefrom(0);
+#endif /* __OpenBSD__ && OpenBSD < 201211 */
+
    /*
-    * Since CoreFoundation has an overly-agressive check for whether a
-    * process has forked but not exec'd (whether CF has been called or
-    * not...), we now have to exec ourselves with the "-f" option to
-    * eliminate their bogus warning messages.
+    * Since CoreFoundation and DBUS both create fork-unsafe data on execution of
+    * a program, and since this kind of really unfriendly behavior seems to be
+    * more common these days in system libraries, we need to re-execute the
+    * background cupsd with the "-C" option to avoid problems.  Unfortunately,
+    * we also have to assume that argv[0] contains the name of the cupsd
+    * executable - there is no portable way to get the real pathname...
     */
 
     execlp(argv[0], argv[0], "-C", ConfigurationFile, (char *)0);
     exit(errno);
-#endif /* __APPLE__ */
   }
 
   if (fg < 1)
@@ -410,9 +476,23 @@ main(int  argc,                            /* I - Number of command-line args */
     * Redirect stdin/out/err to /dev/null...
     */
 
-    open("/dev/null", O_RDONLY);
-    open("/dev/null", O_WRONLY);
-    open("/dev/null", O_WRONLY);
+    if ((i = open("/dev/null", O_RDONLY)) != 0)
+    {
+      dup2(i, 0);
+      close(i);
+    }
+
+    if ((i = open("/dev/null", O_WRONLY)) != 1)
+    {
+      dup2(i, 1);
+      close(i);
+    }
+
+    if ((i = open("/dev/null", O_WRONLY)) != 2)
+    {
+      dup2(i, 2);
+      close(i);
+    }
 #endif /* DEBUG */
   }
 
@@ -455,56 +535,22 @@ main(int  argc,                           /* I - Number of command-line args */
   */
 
   if (!cupsdReadConfiguration())
-  {
-    if (TestConfigFile)
-      printf("%s contains errors\n", ConfigurationFile);
-    else
-      syslog(LOG_LPR, "Unable to read configuration file \'%s\' - exiting!",
-            ConfigurationFile);
     return (1);
-  }
   else if (TestConfigFile)
   {
-    printf("%s is OK\n", ConfigurationFile);
+    printf("\"%s\" is OK.\n", CupsFilesFile);
+    printf("\"%s\" is OK.\n", ConfigurationFile);
     return (0);
   }
 
-  if (!strncmp(TempDir, RequestRoot, strlen(RequestRoot)))
-  {
-   /*
-    * Clean out the temporary directory...
-    */
-
-    cups_dir_t         *dir;           /* Temporary directory */
-    cups_dentry_t      *dent;          /* Directory entry */
-    char               tempfile[1024]; /* Temporary filename */
-
-
-    if ((dir = cupsDirOpen(TempDir)) != NULL)
-    {
-      cupsdLogMessage(CUPSD_LOG_INFO,
-                      "Cleaning out old temporary files in \"%s\"...", TempDir);
-
-      while ((dent = cupsDirRead(dir)) != NULL)
-      {
-        snprintf(tempfile, sizeof(tempfile), "%s/%s", TempDir, dent->filename);
+ /*
+  * Clean out old temp files and printer cache data.
+  */
 
-       if (unlink(tempfile))
-         cupsdLogMessage(CUPSD_LOG_ERROR,
-                         "Unable to remove temporary file \"%s\" - %s",
-                         tempfile, strerror(errno));
-        else
-         cupsdLogMessage(CUPSD_LOG_DEBUG, "Removed temporary file \"%s\"...",
-                         tempfile);
-      }
+  if (!strncmp(TempDir, RequestRoot, strlen(RequestRoot)))
+    cupsdCleanFiles(TempDir, NULL);
 
-      cupsDirClose(dir);
-    }
-    else
-      cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "Unable to open temporary directory \"%s\" - %s",
-                      TempDir, strerror(errno));
-  }
+  cupsdCleanFiles(CacheDir, "*.ipp");
 
 #if HAVE_LAUNCHD
   if (Launchd)
@@ -518,21 +564,12 @@ main(int  argc,                           /* I - Number of command-line args */
   }
 #endif /* HAVE_LAUNCHD */
 
-#if defined(__APPLE__) && defined(HAVE_DLFCN_H)
- /*
-  * Load Print Service quota enforcement library (X Server only)
-  */
-
-  PSQLibRef = dlopen(PSQLibPath, RTLD_LAZY);
-
-  if (PSQLibRef)
-    PSQUpdateQuotaProc = dlsym(PSQLibRef, PSQLibFuncName);
-#endif /* __APPLE__ && HAVE_DLFCN_H */
-
  /*
   * Startup the server...
   */
 
+  httpInitialize();
+
   cupsdStartServer();
 
  /*
@@ -574,28 +611,6 @@ main(int  argc,                            /* I - Number of command-line args */
   signal(SIGTERM, sigterm_handler);
 #endif /* HAVE_SIGSET */
 
-#ifdef __sgi
- /*
-  * Try to create a fake lpsched lock file if one is not already there.
-  * Some Adobe applications need it under IRIX in order to enable
-  * printing...
-  */
-
-  if ((fp = cupsFileOpen("/var/spool/lp/SCHEDLOCK", "w")) == NULL)
-  {
-    syslog(LOG_LPR, "Unable to create fake lpsched lock file "
-                    "\"/var/spool/lp/SCHEDLOCK\"\' - %s!",
-           strerror(errno));
-  }
-  else
-  {
-    fchmod(cupsFileNumber(fp), 0644);
-    fchown(cupsFileNumber(fp), User, Group);
-
-    cupsFileClose(fp);
-  }
-#endif /* __sgi */
-
  /*
   * Initialize authentication certificates...
   */
@@ -607,11 +622,7 @@ main(int  argc,                            /* I - Number of command-line args */
   * we are up and running...
   */
 
-#ifdef __APPLE__
   if (!fg || run_as_child)
-#else
-  if (!fg)
-#endif /* __APPLE__ */
   {
    /*
     * Send a signal to the parent process, but only if the parent is
@@ -630,7 +641,8 @@ main(int  argc,                             /* I - Number of command-line args */
   * Start power management framework...
   */
 
-  cupsdStartSystemMonitor();
+  if (use_sysman)
+    cupsdStartSystemMonitor();
 #endif /* __APPLE__ */
 
  /*
@@ -661,7 +673,6 @@ main(int  argc,                             /* I - Number of command-line args */
   */
 
   current_time  = time(NULL);
-  browse_time   = current_time;
   event_time    = current_time;
   expire_time   = current_time;
   fds           = 1;
@@ -670,12 +681,6 @@ main(int  argc,                            /* I - Number of command-line args */
 
   while (!stop_scheduler)
   {
-#ifdef DEBUG
-    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                    "main: Top of loop, dead_children=%d, NeedReload=%d",
-                    dead_children, NeedReload);
-#endif /* DEBUG */
-
    /*
     * Check if there are dead children to handle...
     */
@@ -706,29 +711,21 @@ main(int  argc,                           /* I - Number of command-line args */
         cupsdPauseListening();
       }
 
-     /*
-      * Check for any active jobs...
-      */
-
-      for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
-          job;
-          job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
-        if (job->state_value == IPP_JOB_PROCESSING)
-         break;
-
      /*
       * Restart if all clients are closed and all jobs finished, or
       * if the reload timeout has elapsed...
       */
 
       if ((cupsArrayCount(Clients) == 0 &&
-           (!job || NeedReload != RELOAD_ALL)) ||
+           (cupsArrayCount(PrintingJobs) == 0 || NeedReload != RELOAD_ALL)) ||
           (time(NULL) - ReloadTime) >= ReloadTimeout)
       {
        /*
        * Shutdown the server...
        */
 
+        DoingShutdown = 1;
+
        cupsdStopServer();
 
        /*
@@ -746,7 +743,8 @@ main(int  argc,                             /* I - Number of command-line args */
        if (Launchd)
        {
         /*
-         * If we were started by launchd get the listen sockets file descriptors...
+         * If we were started by launchd, get the listen socket file
+         * descriptors...
          */
 
          launchd_checkin();
@@ -758,6 +756,8 @@ main(int  argc,                             /* I - Number of command-line args */
         * Startup the server...
         */
 
+        DoingShutdown = 0;
+
         cupsdStartServer();
 
        /*
@@ -788,12 +788,9 @@ main(int  argc,                            /* I - Number of command-line args */
     * inactivity...
     */
 
-    if (timeout == 86400 && Launchd && LaunchdTimeout && !NumPolled &&
+    if (timeout == 86400 && Launchd && LaunchdTimeout &&
         !cupsArrayCount(ActiveJobs) &&
-       (!Browsing || 
-        (!BrowseRemoteProtocols && 
-         (!NumBrowsers || !BrowseLocalProtocols ||
-          cupsArrayCount(Printers) == 0))))
+       (!Browsing || !BrowseLocalProtocols || !cupsArrayCount(Printers)))
     {
       timeout          = LaunchdTimeout;
       launchd_idle_exit = 1;
@@ -808,9 +805,9 @@ main(int  argc,                             /* I - Number of command-line args */
       * Got an error from select!
       */
 
-#ifdef HAVE_DNSSD
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
       cupsd_printer_t  *p;             /* Current printer */
-#endif /* HAVE_DNSSD */
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
 
 
       if (errno == EINTR)              /* Just interrupted by a signal */
@@ -835,8 +832,6 @@ main(int  argc,                             /* I - Number of command-line args */
           i ++, lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
         cupsdLogMessage(CUPSD_LOG_EMERG, "Listeners[%d] = %d", i, lis->fd);
 
-      cupsdLogMessage(CUPSD_LOG_EMERG, "BrowseSocket = %d", BrowseSocket);
-
       cupsdLogMessage(CUPSD_LOG_EMERG, "CGIPipes[0] = %d", CGIPipes[0]);
 
 #ifdef __APPLE__
@@ -853,13 +848,13 @@ main(int  argc,                           /* I - Number of command-line args */
                        job->print_pipes[0], job->print_pipes[1],
                        job->back_pipes[0], job->back_pipes[1]);
 
-#ifdef HAVE_DNSSD
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
       for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
           p;
           p = (cupsd_printer_t *)cupsArrayNext(Printers))
         cupsdLogMessage(CUPSD_LOG_EMERG, "printer[%s] reg_name=\"%s\"", p->name,
                        p->reg_name ? p->reg_name : "(null)");
-#endif /* HAVE_DNSSD */
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
 
       break;
     }
@@ -873,6 +868,20 @@ main(int  argc,                            /* I - Number of command-line args */
     if (DirtyCleanTime && current_time >= DirtyCleanTime)
       cupsdCleanDirty();
 
+#ifdef __APPLE__
+   /*
+    * If we are going to sleep and still have pending jobs, stop them after
+    * a period of time...
+    */
+
+    if (SleepJobs > 0 && current_time >= SleepJobs &&
+        cupsArrayCount(PrintingJobs) > 0)
+    {
+      SleepJobs = 0;
+      cupsdStopAllJobs(CUPSD_JOB_DEFAULT, 5);
+    }
+#endif /* __APPLE__ */
+
 #ifndef __APPLE__
    /*
     * Update the network interfaces once a minute...
@@ -923,31 +932,7 @@ main(int  argc,                            /* I - Number of command-line args */
       expire_time = current_time;
     }
 
-   /*
-    * Update the browse list as needed...
-    */
-
-    if (Browsing)
-    {
-#ifdef HAVE_LIBSLP
-      if ((BrowseRemoteProtocols & BROWSE_SLP) &&
-          BrowseSLPRefresh <= current_time)
-        cupsdUpdateSLPBrowse();
-#endif /* HAVE_LIBSLP */
-
-#ifdef HAVE_LDAP
-      if ((BrowseRemoteProtocols & BROWSE_LDAP) &&
-          BrowseLDAPRefresh <= current_time)
-        cupsdUpdateLDAPBrowse();
-#endif /* HAVE_LDAP */
-    }
-
-    if (Browsing && current_time > browse_time)
-    {
-      cupsdSendBrowseList();
-      browse_time = current_time;
-    }
-
+#ifndef HAVE_AUTHORIZATION_H
    /*
     * Update the root certificate once every 5 minutes if we have client
     * connections...
@@ -961,8 +946,9 @@ main(int  argc,                             /* I - Number of command-line args */
       */
 
       cupsdDeleteCert(0);
-      cupsdAddCert(0, "root", NULL);
+      cupsdAddCert(0, "root", cupsdDefaultAuthType());
     }
+#endif /* !HAVE_AUTHORIZATION_H */
 
    /*
     * Check for new data on the client sockets...
@@ -1008,6 +994,13 @@ main(int  argc,                           /* I - Number of command-line args */
       senddoc_time = current_time;
     }
 
+   /*
+    * Clean job history...
+    */
+
+    if (JobHistoryUpdate && current_time >= JobHistoryUpdate)
+      cupsdCleanJobs();
+
    /*
     * Log statistics at most once a minute when in debug mode...
     */
@@ -1037,8 +1030,6 @@ main(int  argc,                           /* I - Number of command-line args */
                       cupsArrayCount(ActiveJobs));
       cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: printers=%d",
                       cupsArrayCount(Printers));
-      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: printers-implicit=%d",
-                      cupsArrayCount(ImplicitPrinters));
 
       string_count = _cupsStrStatistics(&alloc_bytes, &total_bytes);
       cupsdLogMessage(CUPSD_LOG_DEBUG,
@@ -1119,6 +1110,8 @@ main(int  argc,                           /* I - Number of command-line args */
   * Close all network clients...
   */
 
+  DoingShutdown = 1;
+
   cupsdStopServer();
 
 #ifdef HAVE_LAUNCHD
@@ -1141,53 +1134,10 @@ main(int  argc,                         /* I - Number of command-line args */
   * Stop monitoring system event monitoring...
   */
 
-  cupsdStopSystemMonitor();
+  if (use_sysman)
+    cupsdStopSystemMonitor();
 #endif /* __APPLE__ */
 
-#ifdef HAVE_GSSAPI
- /*
-  * Free the scheduler's Kerberos context...
-  */
-
-#  ifdef __APPLE__
- /*
-  * If the weak-linked GSSAPI/Kerberos library is not present, don't try
-  * to use it...
-  */
-
-  if (krb5_init_context != NULL)
-#  endif /* __APPLE__ */
-  if (KerberosContext)
-    krb5_free_context(KerberosContext);
-#endif /* HAVE_GSSAPI */
-
-#ifdef __APPLE__
-#ifdef HAVE_DLFCN_H
- /* 
-  * Unload Print Service quota enforcement library (X Server only) 
-  */
-
-  PSQUpdateQuotaProc = NULL;
-  if (PSQLibRef)
-  {
-    dlclose(PSQLibRef);
-    PSQLibRef = NULL;
-  }
-#endif /* HAVE_DLFCN_H */
-#endif /* __APPLE__ */
-
-#ifdef __sgi
- /*
-  * Remove the fake IRIX lpsched lock file, but only if the existing
-  * file is not a FIFO which indicates that the real IRIX lpsched is
-  * running...
-  */
-
-  if (!stat("/var/spool/lp/FIFO", &statbuf))
-    if (!S_ISFIFO(statbuf.st_mode))
-      unlink("/var/spool/lp/SCHEDLOCK");
-#endif /* __sgi */
-
   cupsdStopSelect();
 
   return (!stop_scheduler);
@@ -1195,80 +1145,35 @@ main(int  argc,                         /* I - Number of command-line args */
 
 
 /*
- * 'cupsdClosePipe()' - Close a pipe as necessary.
+ * 'cupsdAddString()' - Copy and add a string to an array.
  */
 
-void
-cupsdClosePipe(int *fds)               /* I - Pipe file descriptors (2) */
+int                                    /* O  - 1 on success, 0 on failure */
+cupsdAddString(cups_array_t **a,       /* IO - String array */
+               const char   *s)                /* I  - String to copy and add */
 {
- /*
-  * Close file descriptors as needed...
-  */
+  if (!*a)
+    *a = cupsArrayNew3((cups_array_func_t)strcmp, NULL,
+                      (cups_ahash_func_t)NULL, 0,
+                      (cups_acopy_func_t)_cupsStrAlloc,
+                      (cups_afree_func_t)_cupsStrFree);
 
-  if (fds[0] >= 0)
-  {
-    close(fds[0]);
-    fds[0] = -1;
-  }
-
-  if (fds[1] >= 0)
-  {
-    close(fds[1]);
-    fds[1] = -1;
-  }
+  return (cupsArrayAdd(*a, (char *)s));
 }
 
 
 /*
- * 'cupsdOpenPipe()' - Create a pipe which is closed on exec.
+ * 'cupsdCheckProcess()' - Tell the main loop to check for dead children.
  */
 
-int                                    /* O - 0 on success, -1 on error */
-cupsdOpenPipe(int *fds)                        /* O - Pipe file descriptors (2) */
+void
+cupsdCheckProcess(void)
 {
  /*
-  * Create the pipe...
-  */
-
-  if (pipe(fds))
-  {
-    fds[0] = -1;
-    fds[1] = -1;
-
-    return (-1);
-  }
-
- /*
-  * Set the "close on exec" flag on each end of the pipe...
-  */
-
-  if (fcntl(fds[0], F_SETFD, fcntl(fds[0], F_GETFD) | FD_CLOEXEC))
-  {
-    close(fds[0]);
-    close(fds[1]);
-
-    fds[0] = -1;
-    fds[1] = -1;
-
-    return (-1);
-  }
-
-  if (fcntl(fds[1], F_SETFD, fcntl(fds[1], F_GETFD) | FD_CLOEXEC))
-  {
-    close(fds[0]);
-    close(fds[1]);
-
-    fds[0] = -1;
-    fds[1] = -1;
-
-    return (-1);
-  }
-
- /*
-  * Return 0 indicating success...
+  * Flag that we have dead children...
   */
 
-  return (0);
+  dead_children = 1;
 }
 
 
@@ -1287,6 +1192,21 @@ cupsdClearString(char **s)               /* O - String value */
 }
 
 
+/*
+ * 'cupsdFreeStrings()' - Free an array of strings.
+ */
+
+void
+cupsdFreeStrings(cups_array_t **a)     /* IO - String array */
+{
+  if (*a)
+  {
+    cupsArrayDelete(*a);
+    *a = NULL;
+  }
+}
+
+
 /*
  * 'cupsdHoldSignals()' - Hold child and termination signals.
  */
@@ -1365,7 +1285,7 @@ cupsdSetStringf(char       **s,           /* O - New string */
                 const char *f,         /* I - Printf-style format string */
                ...)                    /* I - Additional args as needed */
 {
-  char         v[4096];                /* Formatting string value */
+  char         v[65536 + 64];          /* Formatting string value */
   va_list      ap;                     /* Argument pointer */
   char         *olds;                  /* Old string */
 
@@ -1400,8 +1320,7 @@ static void
 launchd_checkin(void)
 {
   size_t               i,              /* Looping var */
-                       count;          /* Numebr of listeners */
-  int                  portnum;        /* Port number */
+                       count;          /* Number of listeners */
   launch_data_t                ld_msg,         /* Launch data message */
                        ld_resp,        /* Launch data response */
                        ld_array,       /* Launch data array */
@@ -1507,21 +1426,21 @@ launchd_checkin(void)
 
        if (lis)
        {
-         cupsdLogMessage(CUPSD_LOG_DEBUG, 
+         cupsdLogMessage(CUPSD_LOG_DEBUG,
                  "launchd_checkin: Matched existing listener %s with fd %d...",
                  httpAddrString(&(lis->address), s, sizeof(s)), fd);
        }
        else
        {
-         cupsdLogMessage(CUPSD_LOG_DEBUG, 
+         cupsdLogMessage(CUPSD_LOG_DEBUG,
                  "launchd_checkin: Adding new listener %s with fd %d...",
                  httpAddrString(&addr, s, sizeof(s)), fd);
 
          if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
          {
            cupsdLogMessage(CUPSD_LOG_ERROR,
-                           "launchd_checkin: Unable to allocate listener - %s.",
-                           strerror(errno));
+                           "launchd_checkin: Unable to allocate listener - "
+                           "%s.", strerror(errno));
            exit(EXIT_FAILURE);
          }
 
@@ -1533,17 +1452,7 @@ launchd_checkin(void)
        lis->fd = fd;
 
 #  ifdef HAVE_SSL
-       portnum = 0;
-
-#    ifdef AF_INET6
-       if (lis->address.addr.sa_family == AF_INET6)
-         portnum = ntohs(lis->address.ipv6.sin6_port);
-       else
-#    endif /* AF_INET6 */
-       if (lis->address.addr.sa_family == AF_INET)
-         portnum = ntohs(lis->address.ipv4.sin_port);
-
-       if (portnum == 443)
+       if (httpAddrPort(&(lis->address)) == 443)
          lis->encryption = HTTP_ENCRYPT_ALWAYS;
 #  endif /* HAVE_SSL */
       }
@@ -1567,17 +1476,16 @@ launchd_checkout(void)
 
  /*
   * Create or remove the launchd KeepAlive file based on whether
-  * there are active jobs, polling, browsing for remote printers or 
+  * there are active jobs, polling, browsing for remote printers or
   * shared printers to advertise...
   */
 
-  if ((cupsArrayCount(ActiveJobs) || NumPolled || 
-       (Browsing && 
-       (BrowseRemoteProtocols ||
-        (BrowseLocalProtocols && NumBrowsers && cupsArrayCount(Printers))))))
+  if (cupsArrayCount(ActiveJobs) ||
+      (Browsing && BrowseLocalProtocols && cupsArrayCount(Printers)))
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG,
-                    "Creating launchd keepalive file \"" CUPS_KEEPALIVE "\"...");
+                    "Creating launchd keepalive file \"" CUPS_KEEPALIVE
+                    "\"...");
 
     if ((fd = open(CUPS_KEEPALIVE, O_RDONLY | O_CREAT | O_EXCL, S_IRUSR)) >= 0)
       close(fd);
@@ -1585,7 +1493,8 @@ launchd_checkout(void)
   else
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG,
-                    "Removing launchd keepalive file \"" CUPS_KEEPALIVE "\"...");
+                    "Removing launchd keepalive file \"" CUPS_KEEPALIVE
+                    "\"...");
 
     unlink(CUPS_KEEPALIVE);
   }
@@ -1616,10 +1525,12 @@ static void
 process_children(void)
 {
   int          status;                 /* Exit status of child */
-  int          pid;                    /* Process ID of child */
+  int          pid,                    /* Process ID of child */
+               job_id;                 /* Job ID of child */
   cupsd_job_t  *job;                   /* Current job */
   int          i;                      /* Looping var */
   char         name[1024];             /* Process name */
+  const char   *type;                  /* Type of program */
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "process_children()");
@@ -1643,10 +1554,10 @@ process_children(void)
 #endif /* HAVE_WAITPID */
   {
    /*
-    * Ignore SIGTERM errors - that comes when a job is canceled...
+    * Collect the name of the process that finished...
     */
 
-    cupsdFinishProcess(pid, name, sizeof(name));
+    cupsdFinishProcess(pid, name, sizeof(name), &job_id);
 
    /*
     * Delete certificates for CGI processes...
@@ -1656,162 +1567,188 @@ process_children(void)
       cupsdDeleteCert(pid);
 
    /*
-    * Lookup the PID in the jobs list...
+    * Handle completed job filters...
     */
 
-    for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
-        job;
-        job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
-      if (job->state_value >= IPP_JOB_HELD && (job->filters[0] || job->backend))
+    if (job_id > 0)
+      job = cupsdFindJob(job_id);
+    else
+      job  = NULL;
+
+    if (job)
+    {
+      for (i = 0; job->filters[i]; i ++)
+       if (job->filters[i] == pid)
+         break;
+
+      if (job->filters[i] || job->backend == pid)
       {
-       for (i = 0; job->filters[i]; i ++)
-          if (job->filters[i] == pid)
-           break;
+       /*
+       * OK, this process has gone away; what's left?
+       */
 
-       if (job->filters[i] || job->backend == pid)
+       if (job->filters[i])
+       {
+         job->filters[i] = -pid;
+         type            = "Filter";
+       }
+       else
+       {
+         job->backend = -pid;
+         type         = "Backend";
+       }
+
+       if (status && status != SIGTERM && status != SIGKILL &&
+           status != SIGPIPE)
        {
         /*
-          * OK, this process has gone away; what's left?
+         * An error occurred; save the exit status so we know to stop
+         * the printer or cancel the job when all of the filters finish...
+         *
+         * A negative status indicates that the backend failed and the
+         * printer needs to be stopped.
+         *
+         * In order to preserve the most serious status, we always log
+         * when a process dies due to a signal (e.g. SIGABRT, SIGSEGV,
+         * and SIGBUS) and prefer to log the backend exit status over a
+         * filter's.
          */
 
-          if (job->filters[i])
-           job->filters[i] = -pid;
-         else
-           job->backend = -pid;
+         int old_status = abs(job->status);
+
+          if (WIFSIGNALED(status) ||   /* This process crashed, or */
+              !job->status ||          /* No process had a status, or */
+              (!job->filters[i] && WIFEXITED(old_status)))
+          {                            /* Backend and filter didn't crash */
+           if (job->filters[i])
+             job->status = status;     /* Filter failed */
+           else
+             job->status = -status;    /* Backend failed */
+          }
 
-          if (status && job->status >= 0)
+         if (job->state_value == IPP_JOB_PROCESSING &&
+             job->status_level > CUPSD_LOG_ERROR &&
+             (job->filters[i] || !WIFEXITED(status)))
          {
-          /*
-           * An error occurred; save the exit status so we know to stop
-           * the printer or cancel the job when all of the filters finish...
-           *
-           * A negative status indicates that the backend failed and the
-           * printer needs to be stopped.
-           */
+           char        message[1024];  /* New printer-state-message */
 
-            if (job->filters[i])
-             job->status = status;     /* Filter failed */
-           else
-             job->status = -status;    /* Backend failed */
 
-            if (job->printer && !(job->printer->type & CUPS_PRINTER_FAX) &&
-               job->status_level > CUPSD_LOG_ERROR)
+           job->status_level = CUPSD_LOG_ERROR;
+
+           snprintf(message, sizeof(message), "%s failed", type);
+
+            if (job->printer)
            {
-             job->status_level = CUPSD_LOG_ERROR;
+             strlcpy(job->printer->state_message, message,
+                      sizeof(job->printer->state_message));
+           }
+
+           if (!job->attrs)
+             cupsdLoadJob(job);
 
-              snprintf(job->printer->state_message,
-                      sizeof(job->printer->state_message), "%s failed", name);
-              cupsdAddPrinterHistory(job->printer);
+           if (!job->printer_message && job->attrs)
+           {
+             if ((job->printer_message =
+                      ippFindAttribute(job->attrs, "job-printer-state-message",
+                                       IPP_TAG_TEXT)) == NULL)
+               job->printer_message = ippAddString(job->attrs, IPP_TAG_JOB,
+                                                   IPP_TAG_TEXT,
+                                                   "job-printer-state-message",
+                                                   NULL, NULL);
            }
+
+           if (job->printer_message)
+             cupsdSetString(&(job->printer_message->values[0].string.text),
+                            message);
          }
+       }
 
-        /*
-         * If this is not the last file in a job, see if all of the
-         * filters are done, and if so move to the next file.
-         */
+       /*
+       * If this is not the last file in a job, see if all of the
+       * filters are done, and if so move to the next file.
+       */
 
-          if (job->current_file < job->num_files)
-         {
-           for (i = 0; job->filters[i] < 0; i ++);
+       if (job->current_file < job->num_files && job->printer)
+       {
+         for (i = 0; job->filters[i] < 0; i ++);
 
-           if (!job->filters[i])
-           {
-            /*
-             * Process the next file...
-             */
+         if (!job->filters[i] &&
+             (!job->printer->pc || !job->printer->pc->single_file ||
+              job->backend <= 0))
+         {
+          /*
+           * Process the next file...
+           */
 
-             cupsdFinishJob(job);
-           }
+           cupsdContinueJob(job);
          }
-         break;
+       }
+       else if (job->state_value >= IPP_JOB_CANCELED)
+       {
+        /*
+         * Remove the job from the active list if there are no processes still
+         * running for it...
+         */
+
+         for (i = 0; job->filters[i] < 0; i++);
+
+         if (!job->filters[i] && job->backend <= 0)
+           cupsArrayRemove(ActiveJobs, job);
        }
       }
+    }
 
    /*
-    * Show the exit status as needed...
+    * Show the exit status as needed, ignoring SIGTERM and SIGKILL errors
+    * since they come when we kill/end a process...
     */
 
-    if (status == SIGTERM)
-      status = 0;
-
-    if (status)
+    if (status == SIGTERM || status == SIGKILL)
+    {
+      cupsdLogJob(job, CUPSD_LOG_DEBUG,
+                 "PID %d (%s) was terminated normally with signal %d.", pid,
+                 name, status);
+    }
+    else if (status == SIGPIPE)
+    {
+      cupsdLogJob(job, CUPSD_LOG_DEBUG,
+                 "PID %d (%s) did not catch or ignore signal %d.", pid, name,
+                 status);
+    }
+    else if (status)
     {
       if (WIFEXITED(status))
-       cupsdLogMessage(CUPSD_LOG_DEBUG, "PID %d (%s) stopped with status %d!",
-                       pid, name, WEXITSTATUS(status));
+      {
+        int code = WEXITSTATUS(status);        /* Exit code */
+
+        if (code > 100)
+         cupsdLogJob(job, CUPSD_LOG_DEBUG,
+                     "PID %d (%s) stopped with status %d (%s)", pid, name,
+                     code, strerror(code - 100));
+       else
+         cupsdLogJob(job, CUPSD_LOG_DEBUG,
+                     "PID %d (%s) stopped with status %d.", pid, name, code);
+      }
       else
-       cupsdLogMessage(CUPSD_LOG_ERROR, "PID %d (%s) crashed on signal %d!",
-                       pid, name, WTERMSIG(status));
+       cupsdLogJob(job, CUPSD_LOG_DEBUG, "PID %d (%s) crashed on signal %d.",
+                   pid, name, WTERMSIG(status));
 
       if (LogLevel < CUPSD_LOG_DEBUG)
-        cupsdLogMessage(CUPSD_LOG_INFO,
-                       "Hint: Try setting the LogLevel to \"debug\" to find "
-                       "out more.");
+        cupsdLogJob(job, CUPSD_LOG_INFO,
+                   "Hint: Try setting the LogLevel to \"debug\" to find out "
+                   "more.");
     }
     else
-      cupsdLogMessage(CUPSD_LOG_DEBUG, "PID %d (%s) exited with no errors.",
-                      pid, name);
+      cupsdLogJob(job, CUPSD_LOG_DEBUG, "PID %d (%s) exited with no errors.",
+                 pid, name);
   }
-}
-
-
-/*
- * 'sigchld_handler()' - Handle 'child' signals from old processes.
- */
-
-static void
-sigchld_handler(int sig)               /* I - Signal number */
-{
-  (void)sig;
 
  /*
-  * Flag that we have dead children...
+  * If wait*() is interrupted by a signal, tell main() to call us again...
   */
 
-  dead_children = 1;
-
- /*
-  * Reset the signal handler as needed...
-  */
-
-#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
-  signal(SIGCLD, sigchld_handler);
-#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
-}
-
-
-/*
- * 'sighup_handler()' - Handle 'hangup' signals to reconfigure the scheduler.
- */
-
-static void
-sighup_handler(int sig)                        /* I - Signal number */
-{
-  (void)sig;
-
-  NeedReload = RELOAD_ALL;
-  ReloadTime = time(NULL);
-
-#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
-  signal(SIGHUP, sighup_handler);
-#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
-}
-
-
-/*
- * 'sigterm_handler()' - Handle 'terminate' signals that stop the scheduler.
- */
-
-static void
-sigterm_handler(int sig)               /* I - Signal number */
-{
-  (void)sig;   /* remove compiler warnings... */
-
- /*
-  * Flag that we should stop and return...
-  */
-
-  stop_scheduler = 1;
+  if (pid < 0 && errno == EINTR)
+    dead_children = 1;
 }
 
 
@@ -1826,12 +1763,14 @@ select_timeout(int fds)                 /* I - Number of descriptors returned */
   long                 timeout;        /* Timeout for select */
   time_t               now;            /* Current time */
   cupsd_client_t       *con;           /* Client information */
-  cupsd_printer_t      *p;             /* Printer information */
   cupsd_job_t          *job;           /* Job information */
   cupsd_subscription_t *sub;           /* Subscription information */
   const char           *why;           /* Debugging aid */
 
 
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: JobHistoryUpdate=%ld",
+                 (long)JobHistoryUpdate);
+
  /*
   * Check to see if any of the clients have pending data to be
   * processed; if so, the timeout should be 0...
@@ -1860,6 +1799,18 @@ select_timeout(int fds)                  /* I - Number of descriptors returned */
   timeout = now + 86400;               /* 86400 == 1 day */
   why     = "do nothing";
 
+#ifdef __APPLE__
+ /*
+  * When going to sleep, wake up to cancel jobs that don't complete in time.
+  */
+
+  if (SleepJobs > 0 && SleepJobs < timeout)
+  {
+    timeout = SleepJobs;
+    why     = "cancel jobs before sleeping";
+  }
+#endif /* __APPLE__ */
+
  /*
   * Check whether we are accepting new connections...
   */
@@ -1889,55 +1840,7 @@ select_timeout(int fds)                  /* I - Number of descriptors returned */
     }
 
  /*
-  * Update the browse list as needed...
-  */
-
-  if (Browsing && BrowseLocalProtocols)
-  {
-#ifdef HAVE_LIBSLP
-    if ((BrowseLocalProtocols & BROWSE_SLP) && (BrowseSLPRefresh < timeout))
-    {
-      timeout = BrowseSLPRefresh;
-      why     = "update SLP browsing";
-    }
-#endif /* HAVE_LIBSLP */
-
-#ifdef HAVE_LDAP
-    if ((BrowseLocalProtocols & BROWSE_LDAP) && (BrowseLDAPRefresh < timeout))
-    {
-      timeout = BrowseLDAPRefresh;
-      why     = "update LDAP browsing";
-    }
-#endif /* HAVE_LDAP */
-
-    if ((BrowseLocalProtocols & BROWSE_CUPS) && NumBrowsers)
-    {
-      for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
-           p;
-          p = (cupsd_printer_t *)cupsArrayNext(Printers))
-      {
-       if (p->type & CUPS_PRINTER_REMOTE)
-       {
-         if ((p->browse_time + BrowseTimeout) < timeout)
-         {
-           timeout = p->browse_time + BrowseTimeout;
-           why     = "browse timeout a printer";
-         }
-       }
-       else if (p->shared && !(p->type & CUPS_PRINTER_IMPLICIT))
-       {
-         if (BrowseInterval && (p->browse_time + BrowseInterval) < timeout)
-         {
-           timeout = p->browse_time + BrowseInterval;
-           why     = "send browse update";
-         }
-       }
-      }
-    }
-  }
-
- /*
-  * Check for any active jobs...
+  * Write out changes to configuration and state files...
   */
 
   if (DirtyCleanTime && timeout > DirtyCleanTime)
@@ -1947,20 +1850,43 @@ select_timeout(int fds)                 /* I - Number of descriptors returned */
   }
 
  /*
-  * Check for any active jobs...
+  * Check for any job activity...
   */
 
-  if (timeout > (now + 10) && ActiveJobs)
+  if (JobHistoryUpdate && timeout > JobHistoryUpdate)
   {
-    for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
-        job;
-        job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
-      if (job->state_value <= IPP_JOB_PROCESSING)
-      {
-       timeout = now + 10;
-       why     = "process active jobs";
-       break;
-      }
+    timeout = JobHistoryUpdate;
+    why     = "update job history";
+  }
+
+  for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
+       job;
+       job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
+  {
+    if (job->cancel_time && job->cancel_time < timeout)
+    {
+      timeout = job->cancel_time;
+      why     = "cancel stuck jobs";
+    }
+
+    if (job->kill_time && job->kill_time < timeout)
+    {
+      timeout = job->kill_time;
+      why     = "kill unresponsive jobs";
+    }
+
+    if (job->state_value == IPP_JOB_HELD && job->hold_until < timeout)
+    {
+      timeout = job->hold_until;
+      why     = "release held jobs";
+    }
+
+    if (job->state_value == IPP_JOB_PENDING && timeout > (now + 10))
+    {
+      timeout = now + 10;
+      why     = "start pending jobs";
+      break;
+    }
   }
 
 #ifdef HAVE_MALLINFO
@@ -1989,11 +1915,9 @@ select_timeout(int fds)                  /* I - Number of descriptors returned */
     }
 
  /*
-  * Adjust from absolute to relative time.  If p->browse_time above
-  * was 0 then we can end up with a negative value here, so check.
-  * We add 1 second to the timeout since events occur after the
-  * timeout expires, and limit the timeout to 86400 seconds (1 day)
-  * to avoid select() timeout limits present on some operating
+  * Adjust from absolute to relative time.  We add 1 second to the timeout since
+  * events occur after the timeout expires, and limit the timeout to 86400
+  * seconds (1 day) to avoid select() timeout limits present on some operating
   * systems...
   */
 
@@ -2015,6 +1939,66 @@ select_timeout(int fds)                  /* I - Number of descriptors returned */
 }
 
 
+/*
+ * 'sigchld_handler()' - Handle 'child' signals from old processes.
+ */
+
+static void
+sigchld_handler(int sig)               /* I - Signal number */
+{
+  (void)sig;
+
+ /*
+  * Flag that we have dead children...
+  */
+
+  dead_children = 1;
+
+ /*
+  * Reset the signal handler as needed...
+  */
+
+#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
+  signal(SIGCLD, sigchld_handler);
+#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
+}
+
+
+/*
+ * 'sighup_handler()' - Handle 'hangup' signals to reconfigure the scheduler.
+ */
+
+static void
+sighup_handler(int sig)                        /* I - Signal number */
+{
+  (void)sig;
+
+  NeedReload = RELOAD_ALL;
+  ReloadTime = time(NULL);
+
+#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
+  signal(SIGHUP, sighup_handler);
+#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
+}
+
+
+/*
+ * 'sigterm_handler()' - Handle 'terminate' signals that stop the scheduler.
+ */
+
+static void
+sigterm_handler(int sig)               /* I - Signal number */
+{
+  (void)sig;   /* remove compiler warnings... */
+
+ /*
+  * Flag that we should stop and return...
+  */
+
+  stop_scheduler = 1;
+}
+
+
 /*
  * 'usage()' - Show scheduler usage.
  */
@@ -2022,18 +2006,24 @@ select_timeout(int fds)                 /* I - Number of descriptors returned */
 static void
 usage(int status)                      /* O - Exit status */
 {
-  _cupsLangPuts(status ? stderr : stdout,
-                _("Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l]\n"
-                 "\n"
-                 "-c config-file      Load alternate configuration file\n"
-                 "-f                  Run in the foreground\n"
-                 "-F                  Run in the foreground but detach\n"
-                 "-h                  Show this usage message\n"
-                 "-l                  Run cupsd from launchd(8)\n"));
+  FILE *fp = status ? stderr : stdout; /* Output file */
+
+
+  _cupsLangPuts(fp, _("Usage: cupsd [options]"));
+  _cupsLangPuts(fp, _("Options:"));
+  _cupsLangPuts(fp, _("  -c cupsd.conf           Set cupsd.conf file to use."));
+  _cupsLangPuts(fp, _("  -f                      Run in the foreground."));
+  _cupsLangPuts(fp, _("  -F                      Run in the foreground but "
+                      "detach from console."));
+  _cupsLangPuts(fp, _("  -h                      Show this usage message."));
+  _cupsLangPuts(fp, _("  -l                      Run cupsd from launchd(8)."));
+  _cupsLangPuts(fp, _("  -t                      Test the configuration "
+                      "file."));
+
   exit(status);
 }
 
 
 /*
- * End of "$Id: main.c 7925 2008-09-10 17:47:26Z mike $".
+ * End of "$Id$".
  */