]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - scheduler/main.c
Merge changes from CUPS 1.5svn-r9641
[thirdparty/cups.git] / scheduler / main.c
index f17969eea5880742d446ca2b7e201f1f203cf62a..d043875cc46a09d1ededadbc78542f06c9921f22 100644 (file)
@@ -1,51 +1,43 @@
 /*
- * "$Id: main.c 6365 2007-03-19 20:56:57Z mike $"
+ * "$Id: main.c 7925 2008-09-10 17:47:26Z mike $"
  *
- *   Scheduler main loop for the Common UNIX Printing System (CUPS).
+ *   Main loop for the CUPS scheduler.
  *
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * 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.
- *   launchd_create_dict()     - Create a dictionary representing the launchd
- *                              config file org.cups.cupsd.plist.
- *   launchd_sync_conf()       - Re-write the launchd config file
- *                              org.cups.cupsd.plist based on cupsd.conf.
- *   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.
+ *   cupsdClosePipe()      - Close a pipe as necessary.
+ *   cupsdFreeStrings()    - Free an array of strings.
+ *   cupsdHoldSignals()    - Hold child and termination signals.
+ *   cupsdMakeUUID()       - Make a UUID URI conforming to RFC 4122.
+ *   cupsdOpenPipe()       - Create a pipe which is closed on exec.
+ *   cupsdReleaseSignals() - Release signals for delivery.
+ *   cupsdSetString()      - Set a string value.
+ *   cupsdSetStringf()     - Set a formatted string value.
+ *   cupsd_clean_files()   - Clean out old files.
+ *   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>
+#include <fnmatch.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"
 #  include <notify.h>
 #endif /* HAVE_NOTIFY_H */
 
-#if defined(__APPLE__) && defined(HAVE_DLFCN_H)
-#  include <dlfcn.h>
-#endif /* __APPLE__ && HAVE_DLFCN_H */
-
 
 /*
  * Local functions...
  */
 
+static void            cupsd_clean_files(const char *path,
+                                         const char *pattern);
 #ifdef HAVE_LAUNCHD
 static void            launchd_checkin(void);
 static void            launchd_checkout(void);
-static CFDictionaryRef launchd_create_dict(void);
-static int             launchd_sync_conf(void);
 #endif /* HAVE_LAUNCHD */
 static void            parent_handler(int sig);
 static void            process_children(void);
@@ -120,19 +110,6 @@ static int         dead_children = 0;
 static int             stop_scheduler = 0;
                                        /* Should the scheduler stop? */
 
-#ifdef HAVE_LAUNCHD
-static CFURLRef                launchd_conf_url = NULL;
-                                       /* org.cups.cupsd.plist url */
-static CFDictionaryRef launchd_conf_dict = NULL;
-                                       /* org.cups.cupsd.plist dict */
-#endif /* HAVE_LAUNCHD */
-
-#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.
@@ -154,10 +131,8 @@ main(int  argc,                            /* I - Number of command-line args */
                        browse_time,    /* Next browse send time */
                        senddoc_time,   /* Send-Document time */
                        expire_time,    /* Subscription expire time */
-                       mallinfo_time;  /* Malloc information time */
-  size_t               string_count,   /* String count */
-                       alloc_bytes,    /* Allocated string bytes */
-                       total_bytes;    /* Total string bytes */
+                       report_time,    /* Malloc/client/job report time */
+                       event_time;     /* Last event notification time */
   long                 timeout;        /* Timeout for cupsdDoSelect() */
   struct rlimit                limit;          /* Runtime limit */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
@@ -167,29 +142,61 @@ main(int  argc,                           /* I - Number of command-line args */
   cups_file_t          *fp;            /* Fake lpsched lock file */
   struct stat          statbuf;        /* Needed for checking lpsched FIFO */
 #endif /* __sgi */
+  int                  run_as_child = 0;
+                                       /* 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__ */
 #if HAVE_LAUNCHD
   int                  launchd_idle_exit;
                                        /* Idle exit on select timeout? */
 #endif /* HAVE_LAUNCHD */
 
 
+#ifdef HAVE_GETEUID
+ /*
+  * Check for setuid invocation, which we do not support!
+  */
+
+  if (getuid() != geteuid())
+  {
+    fputs("cupsd: Cannot run as a setuid program\n", stderr);
+    return (1);
+  }
+#endif /* HAVE_GETEUID */
+
  /*
   * Check for command-line arguments...
   */
 
   fg = 0;
 
+#ifdef HAVE_LAUNCHD
+  if (getenv("CUPSD_LAUNCHD"))
+  {
+    Launchd = 1;
+    fg      = 1;
+  }
+#endif /* HAVE_LAUNCHD */
+
   for (i = 1; i < argc; i ++)
     if (argv[i][0] == '-')
       for (opt = argv[i] + 1; *opt != '\0'; opt ++)
         switch (*opt)
        {
+         case 'C' : /* Run as child with config file */
+              run_as_child = 1;
+             fg           = -1;
+
          case 'c' : /* Configuration file */
              i ++;
              if (i >= argc)
              {
                _cupsLangPuts(stderr, _("cupsd: Expected config filename "
-                                       "after \"-c\" option!\n"));
+                                       "after \"-c\" option."));
                usage(1);
              }
 
@@ -217,11 +224,22 @@ main(int  argc,                           /* I - Number of command-line args */
                * are passed a NULL pointer.
                */
 
-                current = malloc(1024);
-               getcwd(current, 1024);
+                if ((current = malloc(1024)) == NULL)
+               {
+                 _cupsLangPuts(stderr,
+                               _("cupsd: Unable to get current directory."));
+                  return (1);
+               }
+
+               if (!getcwd(current, 1024))
+               {
+                 _cupsLangPuts(stderr,
+                               _("cupsd: Unable to get current directory."));
+                  free(current);
+                 return (1);
+               }
 
                cupsdSetStringf(&ConfigurationFile, "%s/%s", current, argv[i]);
-
                free(current);
               }
              break;
@@ -244,26 +262,46 @@ 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;
+
+#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;
+             break;
+
          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);
     }
@@ -325,16 +363,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 __OpenBSD__
+   /*
+    * 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 OpenBSD.
+    */
+
+    _thread_sys_closefrom(0);
+#endif /* __OpenBSD__ */
+
+   /*
+    * 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);
   }
 
   if (fg < 1)
@@ -366,8 +426,30 @@ main(int  argc,                            /* I - Number of command-line args */
 
     getrlimit(RLIMIT_NOFILE, &limit);
 
-    for (i = 0; i < limit.rlim_cur; i ++)
+    for (i = 0; i < limit.rlim_cur && i < 1024; i ++)
+      close(i);
+
+   /*
+    * Redirect stdin/out/err to /dev/null...
+    */
+
+    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 */
   }
 
@@ -411,44 +493,46 @@ main(int  argc,                           /* I - Number of command-line args */
 
   if (!cupsdReadConfiguration())
   {
-    syslog(LOG_LPR, "Unable to read configuration file \'%s\' - exiting!",
-           ConfigurationFile);
+    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);
+    return (0);
+  }
+
+ /*
+  * Clean out old temp files and printer cache data.
+  */
+
+  if (!strncmp(TempDir, RequestRoot, strlen(RequestRoot)))
+    cupsd_clean_files(TempDir, NULL);
+
+  cupsd_clean_files(CacheDir, "*.ipp");
 
 #if HAVE_LAUNCHD
   if (Launchd)
   {
    /*
-    * If we were started by launchd, make sure the cupsd plist file contains
-    * the same listeners as cupsd.conf.
-    */
-
-    launchd_sync_conf();
-
-   /*
-    * Then get the file descriptors from launchd...
+    * If we were started by launchd get the listen sockets file descriptors...
     */
 
     launchd_checkin();
+    launchd_checkout();
   }
 #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();
 
  /*
@@ -523,7 +607,7 @@ main(int  argc,                             /* I - Number of command-line args */
   * we are up and running...
   */
 
-  if (!fg)
+  if (!fg || run_as_child)
   {
    /*
     * Send a signal to the parent process, but only if the parent is
@@ -542,9 +626,27 @@ main(int  argc,                            /* I - Number of command-line args */
   * Start power management framework...
   */
 
-  cupsdStartSystemMonitor();
+  if (use_sysman)
+    cupsdStartSystemMonitor();
 #endif /* __APPLE__ */
 
+ /*
+  * Send server-started event...
+  */
+
+#ifdef HAVE_LAUNCHD
+  if (Launchd)
+    cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL,
+                  "Scheduler started via launchd.");
+  else
+#endif /* HAVE_LAUNCHD */
+  if (fg)
+    cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL,
+                  "Scheduler started in foreground.");
+  else
+    cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL,
+                  "Scheduler started in background.");
+
  /*
   * Start any pending print jobs...
   */
@@ -555,20 +657,16 @@ main(int  argc,                           /* I - Number of command-line args */
   * Loop forever...
   */
 
-  mallinfo_time = 0;
-  browse_time   = time(NULL);
-  senddoc_time  = time(NULL);
-  expire_time   = time(NULL);
+  current_time  = time(NULL);
+  browse_time   = current_time;
+  event_time    = current_time;
+  expire_time   = current_time;
   fds           = 1;
+  report_time   = 0;
+  senddoc_time  = current_time;
 
   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...
     */
@@ -599,29 +697,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();
 
        /*
@@ -638,8 +728,13 @@ main(int  argc,                            /* I - Number of command-line args */
 #if HAVE_LAUNCHD
        if (Launchd)
        {
-         launchd_sync_conf();
+        /*
+         * If we were started by launchd, get the listen socket file
+         * descriptors...
+         */
+
          launchd_checkin();
+         launchd_checkout();
        }
 #endif /* HAVE_LAUNCHD */
 
@@ -647,7 +742,16 @@ main(int  argc,                            /* I - Number of command-line args */
         * Startup the server...
         */
 
+        DoingShutdown = 0;
+
         cupsdStartServer();
+
+       /*
+        * Send a server-restarted event...
+       */
+
+        cupsdAddEvent(CUPSD_EVENT_SERVER_RESTARTED, NULL, NULL,
+                      "Scheduler restarted.");
       }
     }
 
@@ -660,7 +764,8 @@ main(int  argc,                             /* I - Number of command-line args */
     * times.
     */
 
-    timeout = select_timeout(fds);
+    if ((timeout = select_timeout(fds)) > 1 && LastEvent)
+      timeout = 1;
 
 #if HAVE_LAUNCHD
    /*
@@ -670,10 +775,10 @@ main(int  argc,                           /* I - Number of command-line args */
     */
 
     if (timeout == 86400 && Launchd && LaunchdTimeout && !NumPolled &&
-       (!Browsing || 
-        (!BrowseRemoteProtocols && 
-         (!NumBrowsers || !BrowseLocalProtocols ||
-          cupsArrayCount(Printers) == 0))))
+        !cupsArrayCount(ActiveJobs) &&
+       (!Browsing ||
+        (!BrowseRemoteProtocols &&
+         (!BrowseLocalProtocols || !cupsArrayCount(Printers)))))
     {
       timeout          = LaunchdTimeout;
       launchd_idle_exit = 1;
@@ -737,8 +842,8 @@ main(int  argc,                             /* I - Number of command-line args */
       for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
           p;
           p = (cupsd_printer_t *)cupsArrayNext(Printers))
-        cupsdLogMessage(CUPSD_LOG_EMERG, "printer[%s] %d", p->name,
-                       p->dnssd_ipp_fd);
+        cupsdLogMessage(CUPSD_LOG_EMERG, "printer[%s] reg_name=\"%s\"", p->name,
+                       p->reg_name ? p->reg_name : "(null)");
 #endif /* HAVE_DNSSD */
 
       break;
@@ -746,6 +851,39 @@ main(int  argc,                            /* I - Number of command-line args */
 
     current_time = time(NULL);
 
+   /*
+    * Write dirty config/state files...
+    */
+
+    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...
+    */
+
+    if ((current_time - netif_time) >= 60)
+    {
+      netif_time  = current_time;
+      NetIFUpdate = 1;
+    }
+#endif /* !__APPLE__ */
+
 #if HAVE_LAUNCHD
    /*
     * If no other work was scheduled and we're being controlled by launchd
@@ -762,6 +900,14 @@ main(int  argc,                            /* I - Number of command-line args */
     }
 #endif /* HAVE_LAUNCHD */
 
+   /*
+    * Resume listening for new connections as needed...
+    */
+
+    if (ListeningPaused && ListeningPaused <= current_time &&
+        cupsArrayCount(Clients) < MaxClients)
+      cupsdResumeListening();
+
    /*
     * Expire subscriptions and unload completed jobs as needed...
     */
@@ -795,7 +941,7 @@ main(int  argc,                             /* I - Number of command-line args */
 #endif /* HAVE_LDAP */
     }
 
-    if (Browsing && BrowseLocalProtocols && current_time > browse_time)
+    if (Browsing && current_time > browse_time)
     {
       cupsdSendBrowseList();
       browse_time = current_time;
@@ -814,7 +960,7 @@ main(int  argc,                             /* I - Number of command-line args */
       */
 
       cupsdDeleteCert(0);
-      cupsdAddCert(0, "root");
+      cupsdAddCert(0, "root", NULL);
     }
 
    /*
@@ -858,34 +1004,54 @@ main(int  argc,                          /* I - Number of command-line args */
     if ((current_time - senddoc_time) >= 10)
     {
       cupsdCheckJobs();
+      cupsdCleanJobs();
       senddoc_time = current_time;
     }
 
    /*
-    * Log memory usage every minute...
+    * Log statistics at most once a minute when in debug mode...
     */
 
-    if ((current_time - mallinfo_time) >= 60 && LogLevel >= CUPSD_LOG_DEBUG2)
+    if ((current_time - report_time) >= 60 && LogLevel >= CUPSD_LOG_DEBUG)
     {
+      size_t           string_count,   /* String count */
+                       alloc_bytes,    /* Allocated string bytes */
+                       total_bytes;    /* Total string bytes */
 #ifdef HAVE_MALLINFO
-      struct mallinfo mem;             /* Malloc information */
+      struct mallinfo  mem;            /* Malloc information */
 
 
       mem = mallinfo();
-      cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                      "mallinfo: arena = %d, used = %d, free = %d\n",
-                      mem.arena, mem.usmblks + mem.uordblks,
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: malloc-arena=%lu", mem.arena);
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: malloc-used=%lu",
+                      mem.usmblks + mem.uordblks);
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: malloc-free=%lu",
                      mem.fsmblks + mem.fordblks);
 #endif /* HAVE_MALLINFO */
 
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: clients=%d",
+                      cupsArrayCount(Clients));
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: jobs=%d",
+                      cupsArrayCount(Jobs));
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: jobs-active=%d",
+                      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_DEBUG2,
-                      "stringpool: " CUPS_LLFMT " strings, "
-                     CUPS_LLFMT " allocated, " CUPS_LLFMT " total bytes",
-                     CUPS_LLCAST string_count, CUPS_LLCAST alloc_bytes,
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
+                      "Report: stringpool-string-count=" CUPS_LLFMT,
+                     CUPS_LLCAST string_count);
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
+                      "Report: stringpool-alloc-bytes=" CUPS_LLFMT,
+                     CUPS_LLCAST alloc_bytes);
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
+                      "Report: stringpool-total-bytes=" CUPS_LLFMT,
                      CUPS_LLCAST total_bytes);
 
-      mallinfo_time = current_time;
+      report_time = current_time;
     }
 
    /*
@@ -893,10 +1059,12 @@ main(int  argc,                          /* I - Number of command-line args */
     * accumulated.  Don't send these more than once a second...
     */
 
-    if (LastEvent)
+    if (LastEvent && (current_time - event_time) >= 1)
     {
 #ifdef HAVE_NOTIFY_POST
-      if (LastEvent & CUPSD_EVENT_PRINTER_CHANGED)
+      if (LastEvent & (CUPSD_EVENT_PRINTER_ADDED |
+                       CUPSD_EVENT_PRINTER_DELETED |
+                       CUPSD_EVENT_PRINTER_MODIFIED))
       {
         cupsdLogMessage(CUPSD_LOG_DEBUG2,
                        "notify_post(\"com.apple.printerListChange\")");
@@ -924,7 +1092,8 @@ main(int  argc,                            /* I - Number of command-line args */
       * Reset the accumulated events...
       */
 
-      LastEvent     = CUPSD_EVENT_NONE;
+      LastEvent  = CUPSD_EVENT_NONE;
+      event_time = current_time;
     }
   }
 
@@ -933,40 +1102,67 @@ main(int  argc,                          /* I - Number of command-line args */
   */
 
   if (stop_scheduler)
+  {
     cupsdLogMessage(CUPSD_LOG_INFO, "Scheduler shutting down normally.");
+    cupsdAddEvent(CUPSD_EVENT_SERVER_STOPPED, NULL, NULL,
+                  "Scheduler shutting down normally.");
+  }
   else
+  {
     cupsdLogMessage(CUPSD_LOG_ERROR,
                     "Scheduler shutting down due to program error.");
+    cupsdAddEvent(CUPSD_EVENT_SERVER_STOPPED, NULL, NULL,
+                  "Scheduler shutting down due to program error.");
+  }
 
  /*
-  * Close all network clients and stop all jobs...
+  * Close all network clients...
   */
 
+  DoingShutdown = 1;
+
   cupsdStopServer();
 
+#ifdef HAVE_LAUNCHD
+ /*
+  * Update the launchd KeepAlive file as needed...
+  */
+
+  if (Launchd)
+    launchd_checkout();
+#endif /* HAVE_LAUNCHD */
+
+ /*
+  * Stop all jobs...
+  */
+
   cupsdFreeAllJobs();
 
 #ifdef __APPLE__
-  cupsdStopSystemMonitor();
+ /*
+  * Stop monitoring system event monitoring...
+  */
+
+  if (use_sysman)
+    cupsdStopSystemMonitor();
 #endif /* __APPLE__ */
 
-#ifdef HAVE_LAUNCHD
+#ifdef HAVE_GSSAPI
  /*
-  * Update the launchd config file as needed...
+  * Free the scheduler's Kerberos context...
   */
 
-  if (Launchd)
-  {
-    launchd_checkout();
-    launchd_sync_conf();
-
-    if (launchd_conf_url)
-      CFRelease(launchd_conf_url);
+#  ifdef __APPLE__
+ /*
+  * If the weak-linked GSSAPI/Kerberos library is not present, don't try
+  * to use it...
+  */
 
-    if (launchd_conf_dict)
-      CFRelease(launchd_conf_dict);
-  }
-#endif /* HAVE_LAUNCHD */
+  if (krb5_init_context != NULL)
+#  endif /* __APPLE__ */
+  if (KerberosContext)
+    krb5_free_context(KerberosContext);
+#endif /* HAVE_GSSAPI */
 
 #ifdef __sgi
  /*
@@ -986,6 +1182,54 @@ main(int  argc,                           /* I - Number of command-line args */
 }
 
 
+/*
+ * 'cupsdAddString()' - Copy and add a string to an array.
+ */
+
+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 */
+{
+  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);
+
+  return (cupsArrayAdd(*a, (char *)s));
+}
+
+
+/*
+ * 'cupsdCheckProcess()' - Tell the main loop to check for dead children.
+ */
+
+void
+cupsdCheckProcess(void)
+{
+ /*
+  * Flag that we have dead children...
+  */
+
+  dead_children = 1;
+}
+
+
+/*
+ * 'cupsdClearString()' - Clear a string.
+ */
+
+void
+cupsdClearString(char **s)             /* O - String value */
+{
+  if (s && *s)
+  {
+    _cupsStrFree(*s);
+    *s = NULL;
+  }
+}
+
+
 /*
  * 'cupsdClosePipe()' - Close a pipe as necessary.
  */
@@ -1011,6 +1255,97 @@ cupsdClosePipe(int *fds)         /* I - Pipe file descriptors (2) */
 }
 
 
+/*
+ * '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.
+ */
+
+void
+cupsdHoldSignals(void)
+{
+#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+  sigset_t             newmask;        /* New POSIX signal mask */
+#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+
+
+  holdcount ++;
+  if (holdcount > 1)
+    return;
+
+#ifdef HAVE_SIGSET
+  sighold(SIGTERM);
+  sighold(SIGCHLD);
+#elif defined(HAVE_SIGACTION)
+  sigemptyset(&newmask);
+  sigaddset(&newmask, SIGTERM);
+  sigaddset(&newmask, SIGCHLD);
+  sigprocmask(SIG_BLOCK, &newmask, &holdmask);
+#endif /* HAVE_SIGSET */
+}
+
+
+/*
+ * 'cupsdMakeUUID()' - Make a UUID URI conforming to RFC 4122.
+ *
+ * The buffer needs to be at least 46 bytes in size.
+ */
+
+char *                                 /* I - UUID string */
+cupsdMakeUUID(const char *name,                /* I - Object name */
+              int        number,       /* I - Object number */
+             char       *buffer,       /* I - String buffer */
+             size_t     bufsize)       /* I - Size of buffer */
+{
+  char                 data[1024];     /* Source string for MD5 */
+  _cups_md5_state_t    md5state;       /* MD5 state */
+  unsigned char                md5sum[16];     /* MD5 digest/sum */
+
+
+ /*
+  * Build a version 3 UUID conforming to RFC 4122.
+  *
+  * Start with the MD5 sum of the ServerName, RemotePort, object name and
+  * number, and some random data on the end.
+  */
+
+  snprintf(data, sizeof(data), "%s:%d:%s:%d:%04x:%04x", ServerName,
+           RemotePort, name ? name : ServerName, number,
+          CUPS_RAND() & 0xffff, CUPS_RAND() & 0xffff);
+
+  _cupsMD5Init(&md5state);
+  _cupsMD5Append(&md5state, (unsigned char *)data, strlen(data));
+  _cupsMD5Finish(&md5state, md5sum);
+
+ /*
+  * Generate the UUID from the MD5...
+  */
+
+  snprintf(buffer, bufsize,
+           "urn:uuid:%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-"
+          "%02x%02x%02x%02x%02x%02x",
+          md5sum[0], md5sum[1], md5sum[2], md5sum[3], md5sum[4], md5sum[5],
+          (md5sum[6] & 15) | 0x30, md5sum[7], (md5sum[8] & 0x3f) | 0x40,
+          md5sum[9], md5sum[10], md5sum[11], md5sum[12], md5sum[13],
+          md5sum[14], md5sum[15]);
+
+  return (buffer);
+}
+
+
 /*
  * 'cupsdOpenPipe()' - Create a pipe which is closed on exec.
  */
@@ -1065,50 +1400,7 @@ cupsdOpenPipe(int *fds)                  /* O - Pipe file descriptors (2) */
 
 
 /*
- * 'cupsdClearString()' - Clear a string.
- */
-
-void
-cupsdClearString(char **s)             /* O - String value */
-{
-  if (s && *s)
-  {
-    _cupsStrFree(*s);
-    *s = NULL;
-  }
-}
-
-
-/*
- * 'cupsdHoldSignals()' - Hold child and termination signals.
- */
-
-void
-cupsdHoldSignals(void)
-{
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  sigset_t             newmask;        /* New POSIX signal mask */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
-  holdcount ++;
-  if (holdcount > 1)
-    return;
-
-#ifdef HAVE_SIGSET
-  sighold(SIGTERM);
-  sighold(SIGCHLD);
-#elif defined(HAVE_SIGACTION)
-  sigemptyset(&newmask);
-  sigaddset(&newmask, SIGTERM);
-  sigaddset(&newmask, SIGCHLD);
-  sigprocmask(SIG_BLOCK, &newmask, &holdmask);
-#endif /* HAVE_SIGSET */
-}
-
-
-/*
- * 'cupsdReleaseSignals()' - Release signals for delivery.
+ * 'cupsdReleaseSignals()' - Release signals for delivery.
  */
 
 void
@@ -1183,6 +1475,60 @@ cupsdSetStringf(char       **s,          /* O - New string */
 }
 
 
+/*
+ * 'cupsd_clean_files()' - Clean out old files.
+ */
+static void
+cupsd_clean_files(const char *path,    /* I - Directory to clean */
+                  const char *pattern) /* I - Filename pattern or NULL */
+{
+  cups_dir_t   *dir;                   /* Directory */
+  cups_dentry_t        *dent;                  /* Directory entry */
+  char         filename[1024];         /* Filename */
+  int          status;                 /* Status from unlink/rmdir */
+
+
+  cupsdLogMessage(CUPSD_LOG_DEBUG,
+                  "cupsd_clean_files(path=\"%s\", pattern=\"%s\")", path,
+                 pattern ? pattern : "(null)");
+
+  if ((dir = cupsDirOpen(path)) == NULL)
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open directory \"%s\" - %s",
+                   path, strerror(errno));
+    return;
+  }
+
+  cupsdLogMessage(CUPSD_LOG_INFO, "Cleaning out old files in \"%s\"...", path);
+
+  while ((dent = cupsDirRead(dir)) != NULL)
+  {
+    if (pattern && fnmatch(pattern, dent->filename, 0))
+      continue;
+
+    snprintf(filename, sizeof(filename), "%s/%s", path, dent->filename);
+
+    if (S_ISDIR(dent->fileinfo.st_mode))
+    {
+      cupsd_clean_files(filename, pattern);
+
+      status = rmdir(filename);
+    }
+    else
+      status = unlink(filename);
+
+    if (status)
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to remove \"%s\" - %s", filename,
+                     strerror(errno));
+    else
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Removed \"%s\"...", filename);
+  }
+
+  cupsDirClose(dir);
+}
+
+
 #ifdef HAVE_LAUNCHD
 /*
  * 'launchd_checkin()' - Check-in with launchd and collect the listening fds.
@@ -1191,9 +1537,11 @@ cupsdSetStringf(char       **s,          /* O - New string */
 static void
 launchd_checkin(void)
 {
-  int                  i,              /* Looping var */
-                       count,          /* Numebr of listeners */
-                       portnum;        /* Port number */
+  size_t               i,              /* Looping var */
+                       count;          /* Number of listeners */
+#  ifdef HAVE_SSL
+  int                  portnum;        /* Port number */
+#  endif /* HAVE_SSL */
   launch_data_t                ld_msg,         /* Launch data message */
                        ld_resp,        /* Launch data response */
                        ld_array,       /* Launch data array */
@@ -1219,6 +1567,7 @@ launchd_checkin(void)
                    "launchd_checkin: launch_msg(\"" LAUNCH_KEY_CHECKIN
                    "\") IPC failure");
     exit(EXIT_FAILURE);
+    return; /* anti-compiler-warning */
   }
 
   if (launch_data_get_type(ld_resp) == LAUNCH_DATA_ERRNO)
@@ -1227,28 +1576,32 @@ launchd_checkin(void)
     cupsdLogMessage(CUPSD_LOG_ERROR, "launchd_checkin: Check-in failed: %s",
                     strerror(errno));
     exit(EXIT_FAILURE);
+    return; /* anti-compiler-warning */
   }
 
  /*
   * Get the sockets dictionary...
   */
 
-  if (!(ld_sockets = launch_data_dict_lookup(ld_resp, LAUNCH_JOBKEY_SOCKETS)))
+  if ((ld_sockets = launch_data_dict_lookup(ld_resp, LAUNCH_JOBKEY_SOCKETS))
+          == NULL)
   {
     cupsdLogMessage(CUPSD_LOG_ERROR,
                     "launchd_checkin: No sockets found to answer requests on!");
     exit(EXIT_FAILURE);
+    return; /* anti-compiler-warning */
   }
 
  /*
   * Get the array of listener sockets...
   */
 
-  if (!(ld_array = launch_data_dict_lookup(ld_sockets, "Listeners")))
+  if ((ld_array = launch_data_dict_lookup(ld_sockets, "Listeners")) == NULL)
   {
     cupsdLogMessage(CUPSD_LOG_ERROR,
                     "launchd_checkin: No sockets found to answer requests on!");
     exit(EXIT_FAILURE);
+    return; /* anti-compiler-warning */
   }
 
  /*
@@ -1265,108 +1618,78 @@ launchd_checkin(void)
       * Get the launchd file descriptor and address...
       */
 
-      tmp     = launch_data_array_get_index(ld_array, i);
-      fd      = launch_data_get_fd(tmp);
-      addrlen = sizeof(addr);
-
-      if (getsockname(fd, (struct sockaddr *)&addr, &addrlen))
+      if ((tmp = launch_data_array_get_index(ld_array, i)) != NULL)
       {
-       cupsdLogMessage(CUPSD_LOG_ERROR,
-                       "launchd_checkin: Unable to get local address - %s",
-                       strerror(errno));
-       continue;
-      }
+       fd      = launch_data_get_fd(tmp);
+       addrlen = sizeof(addr);
 
-     /*
-      * Try to match the launchd socket address to one of the listeners...
-      */
+       if (getsockname(fd, (struct sockaddr *)&addr, &addrlen))
+       {
+         cupsdLogMessage(CUPSD_LOG_ERROR,
+                         "launchd_checkin: Unable to get local address - %s",
+                         strerror(errno));
+         continue;
+       }
 
-      for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
-          lis;
-          lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
-       if (httpAddrEqual(&lis->address, &addr))
-         break;
+       /*
+       * Try to match the launchd socket address to one of the listeners...
+       */
 
-     /*
-      * Add a new listener If there's no match...
-      */
+       for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
+            lis;
+            lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
+         if (httpAddrEqual(&lis->address, &addr))
+           break;
 
-      if (lis)
-      {
-       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, 
-               "launchd_checkin: Adding new listener %s with fd %d...",
-               httpAddrString(&addr, s, sizeof(s)), fd);
+       /*
+       * Add a new listener If there's no match...
+       */
 
-        if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
-        {
-         cupsdLogMessage(CUPSD_LOG_ERROR,
-                                 "launchd_checkin: Unable to allocate listener - %s.",
-                         strerror(errno));
-         exit(EXIT_FAILURE);
-        }
+       if (lis)
+       {
+         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,
+                 "launchd_checkin: Adding new listener %s with fd %d...",
+                 httpAddrString(&addr, s, sizeof(s)), fd);
 
-        cupsArrayAdd(Listeners, lis);
+         if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
+         {
+           cupsdLogMessage(CUPSD_LOG_ERROR,
+                           "launchd_checkin: Unable to allocate listener - "
+                           "%s.", strerror(errno));
+           exit(EXIT_FAILURE);
+         }
 
-       memcpy(&lis->address, &addr, sizeof(lis->address));
-      }
+         cupsArrayAdd(Listeners, lis);
+
+         memcpy(&lis->address, &addr, sizeof(lis->address));
+       }
 
-      lis->fd = fd;
+       lis->fd = fd;
 
 #  ifdef HAVE_SSL
-      portnum = 0;
+       portnum = 0;
 
 #    ifdef AF_INET6
-      if (lis->address.addr.sa_family == AF_INET6)
-       portnum = ntohs(lis->address.ipv6.sin6_port);
-      else
+       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 (lis->address.addr.sa_family == AF_INET)
+         portnum = ntohs(lis->address.ipv4.sin_port);
 
-      if (portnum == 443)
-       lis->encryption = HTTP_ENCRYPT_ALWAYS;
+       if (portnum == 443)
+         lis->encryption = HTTP_ENCRYPT_ALWAYS;
 #  endif /* HAVE_SSL */
+      }
     }
   }
 
- /*
-  * Collect the browse socket (if there is one)...
-  */
-
-  if ((ld_array = launch_data_dict_lookup(ld_sockets, "BrowseSockets")))
-  {
-    if (launch_data_get_type(ld_array) == LAUNCH_DATA_ARRAY)
-    {
-      if ((tmp = launch_data_array_get_index(ld_array, 0)))
-      {
-       if (launch_data_get_type(tmp) == LAUNCH_DATA_FD)
-       {
-         if (BrowseSocket != -1)
-           close(BrowseSocket);
-
-         BrowseSocket = launch_data_get_fd(tmp);
-       }
-       else
-         cupsdLogMessage(CUPSD_LOG_WARN,
-                         "launchd_checkin: BrowseSocket not a fd!");
-     }
-     else
-       cupsdLogMessage(CUPSD_LOG_WARN,
-                      "launchd_checkin: BrowseSockets is an empty array!");
-   }
-   else
-     cupsdLogMessage(CUPSD_LOG_WARN,
-                     "launchd_checkin: BrowseSockets is not an array!");
-  }
-  else
-    cupsdLogMessage(CUPSD_LOG_DEBUG, "launchd_checkin: No BrowseSockets");
-
   launch_data_free(ld_msg);
   launch_data_free(ld_resp);
 }
@@ -1384,17 +1707,18 @@ 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) || NumPolled ||
+      (Browsing &&
+       (BrowseRemoteProtocols || 
+        (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);
@@ -1402,346 +1726,12 @@ launchd_checkout(void)
   else
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG,
-                    "Removing launchd keepalive file \"" CUPS_KEEPALIVE "\"...");
+                    "Removing launchd keepalive file \"" CUPS_KEEPALIVE
+                    "\"...");
 
     unlink(CUPS_KEEPALIVE);
   }
 }
-
-
-/*
- * 'launchd_create_dict()' - Create a dictionary representing the launchd
- *                          config file org.cups.cupsd.plist.
- */
-
-static CFDictionaryRef                 /* O - CFDictionary */
-launchd_create_dict(void)
-{
-  int                  portnum;        /* Port number */
-  bool                 runatload;      /* Run at load? */
-  CFMutableDictionaryRef cupsd_dict,   /* org.cups.cupsd.plist dictionary */
-                       keepalive,      /* KeepAlive dictionary */
-                       pathstate,      /* PathState dictionary */
-                       sockets,        /* Sockets dictionary */
-                       listener;       /* Listener dictionary */
-  CFMutableArrayRef    array;          /* Array */
-  CFNumberRef          socket_mode;    /* Domain socket mode bits */
-  CFStringRef          socket_path;    /* Domain socket path */
-  CFTypeRef            value;          /* CF values */
-  cupsd_listener_t     *lis;           /* Current listening socket */
-  struct servent       *service;       /* Services data base entry */
-  char                 temp[1024];     /* Temporary buffer for value */
-
-
-  if ((cupsd_dict = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
-                               &kCFTypeDictionaryKeyCallBacks,
-                               &kCFTypeDictionaryValueCallBacks)) == NULL)
-    return (NULL);
-
-  CFDictionaryAddValue(cupsd_dict, CFSTR(LAUNCH_JOBKEY_LABEL),
-                      CFSTR("org.cups.cupsd"));
-  CFDictionaryAddValue(cupsd_dict, CFSTR(LAUNCH_JOBKEY_ONDEMAND),
-                      kCFBooleanTrue);
-
- /*
-  * Use run-at-load and/or KeepAlive if there are active jobs, polling or
-  * shared printers to advertise...
-  */
-
-  if ((keepalive = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
-                               &kCFTypeDictionaryKeyCallBacks,
-                               &kCFTypeDictionaryValueCallBacks)) != NULL)
-  {
-    if ((pathstate = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
-                               &kCFTypeDictionaryKeyCallBacks,
-                               &kCFTypeDictionaryValueCallBacks)) != NULL)
-    {
-      CFDictionaryAddValue(pathstate, CFSTR(CUPS_KEEPALIVE), kCFBooleanTrue);
-      CFDictionaryAddValue(keepalive, CFSTR(LAUNCH_JOBKEY_PATHSTATE),
-                          pathstate);
-    }
-
-    CFDictionaryAddValue(cupsd_dict, CFSTR(LAUNCH_JOBKEY_KEEPALIVE),
-                        keepalive);
-  }
-
-  runatload = (cupsArrayCount(ActiveJobs) || NumPolled || 
-              (Browsing && BrowseLocalProtocols && 
-               NumBrowsers && cupsArrayCount(Printers))) ? true : false;
-
-  CFDictionaryAddValue(cupsd_dict, CFSTR(LAUNCH_JOBKEY_RUNATLOAD),
-                      runatload ? kCFBooleanTrue : kCFBooleanFalse);
-  CFDictionaryAddValue(cupsd_dict, CFSTR(LAUNCH_JOBKEY_SERVICEIPC),
-                      kCFBooleanTrue);
-
-  if ((array = CFArrayCreateMutable(kCFAllocatorDefault, 2,
-                                   &kCFTypeArrayCallBacks)) != NULL)
-  {
-    CFDictionaryAddValue(cupsd_dict, CFSTR(LAUNCH_JOBKEY_PROGRAMARGUMENTS),
-                        array);
-    CFArrayAppendValue(array, CFSTR("/usr/sbin/cupsd"));
-    CFArrayAppendValue(array, CFSTR("-l"));
-    CFRelease(array);
-  }
-
- /*
-  * Add a sockets dictionary...
-  */
-
-  if ((sockets = (CFMutableDictionaryRef)CFDictionaryCreateMutable(
-                             kCFAllocatorDefault, 0,
-                             &kCFTypeDictionaryKeyCallBacks,
-                             &kCFTypeDictionaryValueCallBacks)) != NULL)
-  {
-    CFDictionaryAddValue(cupsd_dict, CFSTR(LAUNCH_JOBKEY_SOCKETS), sockets);
-
-   /*
-    * Add a Listeners array to the sockets dictionary...
-    */
-
-    if ((array = CFArrayCreateMutable(kCFAllocatorDefault, 0,
-                                     &kCFTypeArrayCallBacks)) != NULL)
-    {
-      CFDictionaryAddValue(sockets, CFSTR("Listeners"), array);
-
-     /*
-      * For each listener add a dictionary to the listeners array...
-      */
-
-      for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
-          lis;
-          lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
-      {
-       if ((listener = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
-                             &kCFTypeDictionaryKeyCallBacks,
-                             &kCFTypeDictionaryValueCallBacks)) != NULL)
-       {
-         CFArrayAppendValue(array, listener);
-
-#  ifdef AF_LOCAL
-         if (lis->address.addr.sa_family == AF_LOCAL)
-         {
-           if ((socket_path = CFStringCreateWithCString(kCFAllocatorDefault,
-                                     lis->address.un.sun_path,
-                                     kCFStringEncodingUTF8)))
-           {
-             CFDictionaryAddValue(listener,
-                                  CFSTR(LAUNCH_JOBSOCKETKEY_PATHNAME),
-                                  socket_path);
-             CFRelease(socket_path);
-           }
-           portnum = 0140777; /* (S_IFSOCK|S_IRWXU|S_IRWXG|S_IRWXO) or *
-                               * 49663d decimal                        */
-           if ((socket_mode = CFNumberCreate(kCFAllocatorDefault,
-                                             kCFNumberIntType, &portnum)))
-           {
-             CFDictionaryAddValue(listener, CFSTR("SockPathMode"),
-                                  socket_mode);
-             CFRelease(socket_mode);
-           }
-         }
-         else
-#  endif /* AF_LOCAL */
-         {
-#  ifdef AF_INET6
-           if (lis->address.addr.sa_family == AF_INET6)
-           {
-             CFDictionaryAddValue(listener,
-                                  CFSTR(LAUNCH_JOBSOCKETKEY_FAMILY),
-                                  CFSTR("IPv6"));
-             portnum = lis->address.ipv6.sin6_port;
-           }
-           else
-#  endif /* AF_INET6 */
-           {
-             CFDictionaryAddValue(listener,
-                                  CFSTR(LAUNCH_JOBSOCKETKEY_FAMILY),
-                                  CFSTR("IPv4"));
-             portnum = lis->address.ipv4.sin_port;
-           }
-
-           if ((service = getservbyport(portnum, NULL)))
-             value = CFStringCreateWithCString(kCFAllocatorDefault,
-                                               service->s_name,
-                                               kCFStringEncodingUTF8);
-           else
-             value = CFNumberCreate(kCFAllocatorDefault,
-                                    kCFNumberIntType, &portnum);
-
-           if (value)
-           {
-             CFDictionaryAddValue(listener,
-                                  CFSTR(LAUNCH_JOBSOCKETKEY_SERVICENAME),
-                                  value);
-             CFRelease(value);
-           }   
-
-           httpAddrString(&lis->address, temp, sizeof(temp));
-           if ((value = CFStringCreateWithCString(kCFAllocatorDefault, temp,
-                                                  kCFStringEncodingUTF8)))
-           {
-             CFDictionaryAddValue(listener,
-                                  CFSTR(LAUNCH_JOBSOCKETKEY_NODENAME),
-                                  value);
-             CFRelease(value);
-           }
-         }
-
-         CFRelease(listener);
-       }
-      }
-
-      CFRelease(array);
-    }
-
-   /*
-    * Add the BrowseSocket to the sockets dictionary...
-    */
-
-    if (Browsing && (BrowseRemoteProtocols & BROWSE_CUPS))
-    {
-      if ((array = CFArrayCreateMutable(kCFAllocatorDefault, 0,
-                                       &kCFTypeArrayCallBacks)) != NULL)
-      {
-       CFDictionaryAddValue(sockets, CFSTR("BrowseSockets"), array);
-
-       if ((listener = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
-                               &kCFTypeDictionaryKeyCallBacks,
-                               &kCFTypeDictionaryValueCallBacks)) != NULL)
-       {
-         CFArrayAppendValue(array, listener);
-
-         CFDictionaryAddValue(listener, CFSTR(LAUNCH_JOBSOCKETKEY_FAMILY),
-                              CFSTR("IPv4"));
-         CFDictionaryAddValue(listener, CFSTR(LAUNCH_JOBSOCKETKEY_TYPE),
-                              CFSTR("dgram"));
-
-         if ((service = getservbyport(BrowsePort, NULL)))
-           value = CFStringCreateWithCString(kCFAllocatorDefault,
-                                             service->s_name,
-                                             kCFStringEncodingUTF8);
-         else
-           value = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType,
-                                  &BrowsePort);
-
-         CFDictionaryAddValue(listener,
-                              CFSTR(LAUNCH_JOBSOCKETKEY_SERVICENAME), value);
-         CFRelease(value);
-
-         CFRelease(listener);
-       }
-
-       CFRelease(array);
-      }
-    }
-
-    CFRelease(sockets);
-  }
-
-  return (cupsd_dict);
-}
-
-
-/*
- * 'launchd_sync_conf()' - Rewrite the launchd config file
- *                        org.cups.cupsd.plist based on cupsd.conf.
- */
-
-static int                             /* O - 1 if the file was updated */
-launchd_sync_conf(void)
-{
-  SInt32               errorCode;      /* Error code */
-  CFDataRef            resourceData;   /* XML property list */
-  CFDictionaryRef      cupsd_dict;     /* New org.cups.cupsd.plist dict */
-
-
- /*
-  * If needed reconstitute the existing org.cups.cupsd.plist...
-  */
-
-  if (!launchd_conf_url && 
-      !(launchd_conf_url = CFURLCreateFromFileSystemRepresentation(
-                               kCFAllocatorDefault,
-                               (const unsigned char *)LaunchdConf,
-                               strlen(LaunchdConf), false)))
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR, "launchd_sync_conf: "
-                   "Unable to create file URL for \"%s\"\n", LaunchdConf);
-    return (0);
-  }
-
-  if (!launchd_conf_dict)
-  {
-    if (CFURLCreateDataAndPropertiesFromResource(NULL, launchd_conf_url, 
-                               &resourceData, NULL, NULL, &errorCode))
-    {
-      launchd_conf_dict = CFPropertyListCreateFromXMLData(NULL, resourceData,
-                                             kCFPropertyListImmutable, NULL);
-      CFRelease(resourceData);
-    }
-
-    if (!launchd_conf_dict)
-    {
-      cupsdLogMessage(CUPSD_LOG_ERROR, "launchd_sync_conf: "
-                     "Unable to create dictionary for \"%s\"\n", LaunchdConf);
-    }
-  }
-
- /*
-  * Create a new org.cups.cupsd.plist dictionary...
-  */
-
-  if ((cupsd_dict = launchd_create_dict()) == NULL)
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR, "launchd_sync_conf: "
-                   "Unable to create file URL for \"%s\"\n", LaunchdConf);
-    return (0);
-  }
-
- /*
-  * If the dictionaries are different write a new org.cups.cupsd.plist...
-  */
-
-  if (!CFEqual(cupsd_dict, launchd_conf_dict))
-  {
-    if ((resourceData = CFPropertyListCreateXMLData(kCFAllocatorDefault,
-                                                   cupsd_dict)))
-    {
-      if (CFURLWriteDataAndPropertiesToResource(launchd_conf_url, resourceData,
-                                                NULL, &errorCode))
-      {
-       /*
-        * The new cupsd dictionary becomes the on-disk launchd dictionary...
-        */
-
-       if (launchd_conf_dict)
-         CFRelease(launchd_conf_dict);
-
-       launchd_conf_dict = cupsd_dict;
-      }
-      else
-      {
-       cupsdLogMessage(CUPSD_LOG_WARN,
-                       "launchd_sync_conf: "
-                       "CFURLWriteDataAndPropertiesToResource(\"%s\") "
-                       "failed: %d\n",
-                       LaunchdConf, (int)errorCode);
-
-       CFRelease(cupsd_dict);
-      }
-  
-      CFRelease(resourceData);
-    }
-
-   /*
-    * Let the caller know we updated the file...
-    */
-
-    return (1);
-  }
-
-  return (0);
-}
 #endif /* HAVE_LAUNCHD */
 
 
@@ -1768,7 +1758,8 @@ 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 */
@@ -1795,31 +1786,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));
-
-    if (status == SIGTERM)
-      status = 0;
-
-    if (status)
-    {
-      if (WIFEXITED(status))
-       cupsdLogMessage(CUPSD_LOG_ERROR, "PID %d (%s) stopped with status %d!",
-                       pid, name, WEXITSTATUS(status));
-      else
-       cupsdLogMessage(CUPSD_LOG_ERROR, "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.");
-    }
-    else
-      cupsdLogMessage(CUPSD_LOG_DEBUG, "PID %d (%s) exited with no errors.",
-                      pid, name);
+    cupsdFinishProcess(pid, name, sizeof(name), &job_id);
 
    /*
     * Delete certificates for CGI processes...
@@ -1829,134 +1799,155 @@ 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_PROCESSING)
+    if (job_id > 0 && (job = cupsdFindJob(job_id)) != NULL)
+    {
+      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->filters[i] = -pid;
+       else
+         job->backend = -pid;
 
-       if (job->filters[i] || job->backend == pid)
+       if (status && status != SIGTERM && status != SIGKILL &&
+           status != SIGPIPE && job->status >= 0)
        {
         /*
-          * 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.
          */
 
-          if (job->filters[i])
-           job->filters[i] = -pid;
+         if (job->filters[i])
+           job->status = status;       /* Filter failed */
          else
-           job->backend = -pid;
+           job->status = -status;      /* Backend failed */
 
-          if (status && job->status >= 0)
+         if (job->state_value == IPP_JOB_PROCESSING &&
+             job->status_level > CUPSD_LOG_ERROR)
          {
-          /*
-           * 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 */
+           job->status_level = CUPSD_LOG_ERROR;
 
-            if (job->printer && !(job->printer->type & CUPS_PRINTER_FAX))
+           snprintf(message, sizeof(message), "%s failed", name);
+
+            if (job->printer)
            {
-              snprintf(job->printer->state_message,
-                      sizeof(job->printer->state_message), "%s failed", name);
-              cupsdAddPrinterHistory(job->printer);
+             strlcpy(job->printer->state_message, message,
+                      sizeof(job->printer->state_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 (!job->attrs)
+             cupsdLoadJob(job);
 
-          if (job->current_file < job->num_files)
-         {
-           for (i = 0; job->filters[i] < 0; i ++);
-
-           if (!job->filters[i])
+           if (!job->printer_message && job->attrs)
            {
-            /*
-             * Process the next file...
-             */
-
-             cupsdFinishJob(job);
+             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);
          }
-         break;
        }
-      }
-  }
-}
-
 
-/*
- * '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 */
-}
+       /*
+       * 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 && job->printer)
+       {
+         for (i = 0; job->filters[i] < 0; i ++);
 
-/*
- * 'sighup_handler()' - Handle 'hangup' signals to reconfigure the scheduler.
- */
+         if (!job->filters[i] &&
+             (!job->printer->pc || !job->printer->pc->single_file ||
+              job->backend <= 0))
+         {
+          /*
+           * Process the next file...
+           */
 
-static void
-sighup_handler(int sig)        /* I - Signal number */
-{
-  (void)sig;
+           cupsdContinueJob(job);
+         }
+       }
+       else if (job->state_value >= IPP_JOB_CANCELED)
+       {
+        /*
+         * Remove the job from the active list if there are no processes still
+         * running for it...
+         */
 
-  NeedReload = RELOAD_ALL;
-  ReloadTime = time(NULL);
+         for (i = 0; job->filters[i] < 0; i++);
 
-#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
-  signal(SIGHUP, sighup_handler);
-#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
-}
+         if (!job->filters[i] && job->backend <= 0)
+           cupsArrayRemove(ActiveJobs, job);
+       }
+      }
+    }
 
+   /*
+    * Show the exit status as needed, ignoring SIGTERM and SIGKILL errors
+    * since they come when we kill/end a process...
+    */
 
-/*
- * 'sigterm_handler()' - Handle 'terminate' signals that stop the scheduler.
- */
+    if (status == SIGTERM || status == SIGKILL)
+    {
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
+                      "PID %d (%s) was terminated normally with signal %d.",
+                      pid, name, status);
+    }
+    else if (status == SIGPIPE)
+    {
+      cupsdLogMessage(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));
+      else
+       cupsdLogMessage(CUPSD_LOG_ERROR, "PID %d (%s) crashed on signal %d!",
+                       pid, name, WTERMSIG(status));
 
-static void
-sigterm_handler(int sig)               /* I - Signal */
-{
-  (void)sig;   /* remove compiler warnings... */
+      if (LogLevel < CUPSD_LOG_DEBUG)
+        cupsdLogMessage(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);
+  }
 
  /*
-  * Flag that we should stop and return...
+  * If wait*() is interrupted by a signal, tell main() to call us again...
   */
 
-  stop_scheduler = 1;
+  if (pid < 0 && errno == EINTR)
+    dead_children = 1;
 }
 
 
@@ -2005,6 +1996,33 @@ 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...
+  */
+
+  if (ListeningPaused > 0 && cupsArrayCount(Clients) < MaxClients &&
+      ListeningPaused < timeout)
+  {
+    if (ListeningPaused <= now)
+      timeout = now;
+    else
+      timeout = ListeningPaused;
+
+    why = "resume listening";
+  }
+
  /*
   * Check the activity and close old clients...
   */
@@ -2066,21 +2084,41 @@ select_timeout(int fds)                 /* I - Number of descriptors returned */
     }
   }
 
+ /*
+  * Write out changes to configuration and state files...
+  */
+
+  if (DirtyCleanTime && timeout > DirtyCleanTime)
+  {
+    timeout = DirtyCleanTime;
+    why     = "write dirty config/state files";
+  }
+
  /*
   * Check for any active jobs...
   */
 
-  if (timeout > (now + 10) && ActiveJobs)
+  for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
+       job;
+       job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
   {
-    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;
-      }
+    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";
+    }
+    else if (job->state_value == IPP_JOB_PENDING && timeout > (now + 10))
+    {
+      timeout = now + 10;
+      why     = "start pending jobs";
+      break;
+    }
   }
 
 #ifdef HAVE_MALLINFO
@@ -2135,6 +2173,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.
  */
@@ -2142,18 +2240,25 @@ 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 config-file          Load alternate configuration "
+                      "file."));
+  _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 6365 2007-03-19 20:56:57Z mike $".
+ * End of "$Id: main.c 7925 2008-09-10 17:47:26Z mike $".
  */