]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - scheduler/dirsvc.c
Import CUPS trunk (1.4svn) r7116.
[thirdparty/cups.git] / scheduler / dirsvc.c
index dd63491d96472125dbacb3b3b1fc7cf977e701d8..5303bf898ff7ba60486815475af9df503f3f6ff8 100644 (file)
@@ -1,53 +1,61 @@
 /*
- * "$Id: dirsvc.c 5023 2006-01-29 14:39:44Z mike $"
+ * "$Id: dirsvc.c 7003 2007-10-01 23:10:13Z mike $"
  *
  *   Directory services routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+ *   Copyright 2007 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
- *   "LICENSE.txt" 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
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *
+ *   cupsdDeregisterPrinter()      - Stop sending broadcast information for a 
+ *                                  local printer and remove any pending
+ *                                   references to remote printers.
  *   cupsdLoadRemoteCache()        - Load the remote printer cache.
- *   cupsdProcessBrowseData()      - Process new browse data.
- *   cupsdProcessImplicitClasses() - Create/update implicit classes as needed.
+ *   cupsdRegisterPrinter()        - Start sending broadcast information for a
+ *                                   printer update the broadcast contents.
  *   cupsdSaveRemoteCache()        - Save the remote printer cache.
- *   cupsdSendBrowseDelete()       - Send a "browse delete" message for a
- *                                   printer.
  *   cupsdSendBrowseList()         - Send new browsing information as necessary.
- *   cupsdSendCUPSBrowse()         - Send new browsing information using the
- *                                   CUPS protocol.
- *   cupsdSendSLPBrowse()          - Register the specified printer with SLP.
  *   cupsdStartBrowsing()          - Start sending and receiving broadcast
  *                                   information.
  *   cupsdStartPolling()           - Start polling servers as needed.
  *   cupsdStopBrowsing()           - Stop sending and receiving broadcast
  *                                   information.
  *   cupsdStopPolling()            - Stop polling servers as needed.
- *   cupsdUpdateCUPSBrowse()       - Update the browse lists using the CUPS
- *                                   protocol.
- *   cupsdUpdatePolling()          - Read status messages from the poll daemons.
+ *   cupsdUpdateDNSSDBrowse()      - Handle DNS-SD queries.
+ *   cupsdUpdateLDAPBrowse()       - Scan for new printers via LDAP...
  *   cupsdUpdateSLPBrowse()        - Get browsing information via SLP.
+ *   dnssdBuildTxtRecord()         - Build a TXT record from printer info.
+ *   dnssdDeregisterPrinter()      - Stop sending broadcast information for a
+ *                                   printer.
+ *   dnssdPackTxtRecord()          - Pack an array of key/value pairs into the
+ *                                   TXT record format.
+ *   dnssdRegisterCallback()       - DNSServiceRegister callback.
+ *   dnssdRegisterPrinter()        - Start sending broadcast information for a
+ *                                   printer or update the broadcast contents.
+ *   dequote()                     - Remote quotes from a string.
+ *   process_browse_data()         - Process new browse data.
+ *   process_implicit_classes()    - Create/update implicit classes as needed.
+ *   send_cups_browse()            - Send new browsing information using the
+ *                                   CUPS protocol.
+ *   send_ldap_browse()            - Send LDAP printer registrations.
+ *   send_slp_browse()             - Register the specified printer with SLP.
  *   slp_attr_callback()           - SLP attribute callback 
  *   slp_dereg_printer()           - SLPDereg() the specified printer
  *   slp_get_attr()                - Get an attribute from an SLP registration.
  *   slp_reg_callback()            - Empty SLPRegReport.
  *   slp_url_callback()            - SLP service url callback
+ *   update_cups_browse()          - Update the browse lists using the CUPS
+ *                                   protocol.
+ *   update_lpd()                  - Update the LPD configuration as needed.
+ *   update_polling()              - Read status messages from the poll daemons.
+ *   update_smb()                  - Update the SMB configuration as needed.
  */
 
 /*
 #include "cupsd.h"
 #include <grp.h>
 
+#ifdef HAVE_DNSSD
+#  include <dns_sd.h>
+#  ifdef __APPLE__
+#    include <nameser.h>
+#    ifdef HAVE_COREFOUNDATION
+#      include <CoreFoundation/CoreFoundation.h>
+#    endif /* HAVE_COREFOUNDATION */
+#    ifdef HAVE_SYSTEMCONFIGURATION
+#      include <SystemConfiguration/SystemConfiguration.h>
+#    endif /* HAVE_SYSTEMCONFIGURATION */
+#  endif /* __APPLE__ */
+#endif /* HAVE_DNSSD */
+
 
 /*
- * SLP definitions...
+ * Local functions...
  */
 
+static char    *dequote(char *d, const char *s, int dlen);
+static int     is_local_queue(const char *uri, char *host, int hostlen,
+                              char *resource, int resourcelen);
+static void    process_browse_data(const char *uri, const char *host,
+                                   const char *resource, cups_ptype_t type,
+                                   ipp_pstate_t state, const char *location,
+                                   const char *info, const char *make_model,
+                                   int num_attrs, cups_option_t *attrs);
+static void    process_implicit_classes(int *write_printcap);
+static void    send_cups_browse(cupsd_printer_t *p);
+#ifdef HAVE_LDAP
+static void    send_ldap_browse(cupsd_printer_t *p);
+#endif /* HAVE_LDAP */
+#ifdef HAVE_LIBSLP
+static void    send_slp_browse(cupsd_printer_t *p);
+#endif /* HAVE_LIBSLP */
+static void    update_cups_browse(void);
+static void    update_lpd(int onoff);
+static void    update_polling(void);
+static void    update_smb(int onoff);
+
+
+#ifdef HAVE_OPENLDAP
+static const char * const ldap_attrs[] =/* CUPS LDAP attributes */
+               {
+                 "printerDescription",
+                 "printerLocation",
+                 "printerMakeAndModel",
+                 "printerType",
+                 "printerURI",
+                 NULL
+               };
+#endif /* HAVE_OPENLDAP */
+
 #ifdef HAVE_LIBSLP 
+/*
+ * SLP definitions...
+ */
+
 /*
  * SLP service name for CUPS...
  */
@@ -99,6 +158,72 @@ static SLPBoolean   slp_url_callback(SLPHandle hslp, const char *srvurl,
                                         SLPError errcode, void *cookie);
 #endif /* HAVE_LIBSLP */
 
+#ifdef HAVE_DNSSD
+/*
+ * For IPP register using a subtype of 'cups' so that shared printer browsing
+ * only finds other CUPS servers (not all IPP based printers).
+ */
+static char    dnssdIPPRegType[]    = "_ipp._tcp,_cups";
+static char    dnssdIPPFaxRegType[] = "_fax-ipp._tcp";
+
+static char    *dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p);
+static void    dnssdDeregisterPrinter(cupsd_printer_t *p);
+static char    *dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2],
+                                   int count);
+static void    dnssdRegisterCallback(DNSServiceRef sdRef,
+                                     DNSServiceFlags flags, 
+                                     DNSServiceErrorType errorCode,
+                                     const char *name, const char *regtype,
+                                     const char *domain, void *context);
+static void    dnssdRegisterPrinter(cupsd_printer_t *p);
+#endif /* HAVE_DNSSD */
+
+
+/*
+ * 'cupsdDeregisterPrinter()' - Stop sending broadcast information for a 
+ *                             local printer and remove any pending
+ *                              references to remote printers.
+ */
+
+void
+cupsdDeregisterPrinter(
+    cupsd_printer_t *p,                        /* I - Printer to register */
+    int             removeit)          /* I - Printer being permanently removed */
+{
+ /*
+  * Only deregister if browsing is enabled and it's a local printers...
+  */
+
+  if (!Browsing || !p->shared ||
+      (p->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)))
+    return;
+
+ /*
+  * Announce the deletion...
+  */
+
+  if ((BrowseLocalProtocols & BROWSE_CUPS) && BrowseSocket >= 0)
+  {
+    cups_ptype_t savedtype = p->type;  /* Saved printer type */
+
+    p->type |= CUPS_PRINTER_DELETE;
+
+    send_cups_browse(p);
+
+    p->type = savedtype;
+  }
+
+#ifdef HAVE_LIBSLP
+  if (BrowseLocalProtocols & BROWSE_SLP)
+    slp_dereg_printer(p);
+#endif /* HAVE_LIBSLP */
+
+#ifdef HAVE_DNSSD
+  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD))
+    dnssdDeregisterPrinter(p);
+#endif /* HAVE_DNSSD */
+}
+
 
 /*
  * 'cupsdLoadRemoteCache()' - Load the remote printer cache.
@@ -111,11 +236,29 @@ cupsdLoadRemoteCache(void)
   int                  linenum;        /* Current line number */
   char                 line[1024],     /* Line from file */
                        *value,         /* Pointer to value */
-                       *valueptr;      /* Pointer into value */
+                       *valueptr,      /* Pointer into value */
+                       scheme[32],     /* Scheme portion of URI */
+                       username[64],   /* Username portion of URI */
+                       host[HTTP_MAX_HOST],
+                                       /* Hostname portion of URI */
+                       resource[HTTP_MAX_URI];
+                                       /* Resource portion of URI */
+  int                  port;           /* Port number */
   cupsd_printer_t      *p;             /* Current printer */
   time_t               now;            /* Current time */
 
 
+ /*
+  * Don't load the cache if the CUPS remote protocol is disabled...
+  */
+
+  if (!Browsing || !(BrowseRemoteProtocols & BROWSE_CUPS))
+  {
+    cupsdLogMessage(CUPSD_LOG_DEBUG,
+                    "cupsdLoadRemoteCache: Not loading remote cache.");
+    return;
+  }
+
  /*
   * Open the remote.cache file...
   */
@@ -154,11 +297,26 @@ cupsdLoadRemoteCache(void)
         cupsdLogMessage(CUPSD_LOG_DEBUG,
                        "cupsdLoadRemoteCache: Loading printer %s...", value);
 
-        p = cupsdAddPrinter(value);
-       p->accepting   = 1;
-       p->state       = IPP_PRINTER_IDLE;
-       p->type        |= CUPS_PRINTER_REMOTE;
-       p->browse_time = now + BrowseTimeout;
+        if ((p = cupsdFindDest(value)) != NULL)
+       {
+         if (p->type & CUPS_PRINTER_CLASS)
+         {
+           cupsdLogMessage(CUPSD_LOG_WARN,
+                           "Cached remote printer \"%s\" conflicts with "
+                           "existing class!",
+                           value);
+           p = NULL;
+           continue;
+         }
+       }
+       else
+          p = cupsdAddPrinter(value);
+
+       p->accepting     = 1;
+       p->state         = IPP_PRINTER_IDLE;
+       p->type          |= CUPS_PRINTER_REMOTE | CUPS_PRINTER_DISCOVERED;
+       p->browse_time   = now;
+       p->browse_expire = now + BrowseTimeout;
 
        /*
         * Set the default printer as needed...
@@ -190,11 +348,16 @@ cupsdLoadRemoteCache(void)
         cupsdLogMessage(CUPSD_LOG_DEBUG,
                        "cupsdLoadRemoteCache: Loading class %s...", value);
 
-        p = cupsdAddClass(value);
-       p->accepting   = 1;
-       p->state       = IPP_PRINTER_IDLE;
-       p->type        |= CUPS_PRINTER_REMOTE;
-       p->browse_time = now + BrowseTimeout;
+        if ((p = cupsdFindDest(value)) != NULL)
+         p->type = CUPS_PRINTER_CLASS;
+       else
+          p = cupsdAddClass(value);
+
+       p->accepting     = 1;
+       p->state         = IPP_PRINTER_IDLE;
+       p->type          |= CUPS_PRINTER_REMOTE | CUPS_PRINTER_DISCOVERED;
+       p->browse_time   = now;
+       p->browse_expire = now + BrowseTimeout;
 
        /*
         * Set the default printer as needed...
@@ -254,7 +417,15 @@ cupsdLoadRemoteCache(void)
     else if (!strcasecmp(line, "DeviceURI"))
     {
       if (value)
+      {
+       httpSeparateURI(HTTP_URI_CODING_ALL, value, scheme, sizeof(scheme),
+                       username, sizeof(username), host, sizeof(host), &port,
+                       resource, sizeof(resource));
+
+       cupsdSetString(&p->hostname, host);
+       cupsdSetString(&p->uri, value);
        cupsdSetString(&p->device_uri, value);
+      }
       else
       {
        cupsdLogMessage(CUPSD_LOG_ERROR,
@@ -262,6 +433,25 @@ cupsdLoadRemoteCache(void)
        return;
       }
     }
+    else if (!strcasecmp(line, "Option") && value)
+    {
+     /*
+      * Option name value
+      */
+
+      for (valueptr = value; *valueptr && !isspace(*valueptr & 255); valueptr ++);
+
+      if (!*valueptr)
+        cupsdLogMessage(CUPSD_LOG_ERROR,
+                       "Syntax error on line %d of remote.cache.", linenum);
+      else
+      {
+        for (; *valueptr && isspace(*valueptr & 255); *valueptr++ = '\0');
+
+        p->num_options = cupsAddOption(value, valueptr, p->num_options,
+                                      &(p->options));
+      }
+    }
     else if (!strcasecmp(line, "State"))
     {
      /*
@@ -328,8 +518,8 @@ cupsdLoadRemoteCache(void)
       {
         time_t t = atoi(value);
 
-       if (t > (now + BrowseInterval))
-          p->browse_time = t;
+       if (t > p->browse_expire)
+          p->browse_expire = t;
       }
       else
       {
@@ -419,183 +609,1237 @@ cupsdLoadRemoteCache(void)
   * Do auto-classing if needed...
   */
 
-  cupsdProcessImplicitClasses();
+  process_implicit_classes(NULL);
 }
 
 
 /*
- * 'cupsdProcessBrowseData()' - Process new browse data.
+ * 'cupsdRegisterPrinter()' - Start sending broadcast information for a
+ *                            printer or update the broadcast contents.
  */
 
 void
-cupsdProcessBrowseData(
-    const char    *uri,                        /* I - URI of printer/class */
-    cups_ptype_t  type,                        /* I - Printer type */
-    ipp_pstate_t  state,               /* I - Printer state */
-    const char    *location,           /* I - Printer location */
-    const char    *info,               /* I - Printer information */
-    const char    *make_model,         /* I - Printer make and model */
-    int                  num_attrs,            /* I - Number of attributes */
-    cups_option_t *attrs)              /* I - Attributes */
+cupsdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */
 {
-  int          update;                 /* Update printer attributes? */
-  char         finaluri[HTTP_MAX_URI], /* Final URI for printer */
-               method[HTTP_MAX_URI],   /* Method portion of URI */
-               username[HTTP_MAX_URI], /* Username portion of URI */
-               host[HTTP_MAX_URI],     /* Host portion of URI */
-               resource[HTTP_MAX_URI]; /* Resource portion of URI */
-  int          port;                   /* Port portion of URI */
-  char         name[IPP_MAX_NAME],     /* Name of printer */
-               *hptr,                  /* Pointer into hostname */
-               *sptr;                  /* Pointer into ServerName */
-  char         local_make_model[IPP_MAX_NAME];
-                                       /* Local make and model */
-  cupsd_printer_t *p;                  /* Printer information */
-  const char   *ipp_options;           /* ipp-options value */
+  if (!Browsing || !BrowseLocalProtocols || !BrowseInterval || !NumBrowsers ||
+      (p->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)))
+    return;
+
+#ifdef HAVE_LIBSLP
+/*  if (BrowseLocalProtocols & BROWSE_SLP)
+    slpRegisterPrinter(p); */
+#endif /* HAVE_LIBSLP */
 
+#ifdef HAVE_DNSSD
+  if (BrowseLocalProtocols & BROWSE_DNSSD)
+    dnssdRegisterPrinter(p);
+#endif /* HAVE_DNSSD */
+}
 
- /*
-  * Pull the URI apart to see if this is a local or remote printer...
-  */
 
-  httpSeparateURI(HTTP_URI_CODING_ALL, uri, method, sizeof(method), username,
-                  sizeof(username), host, sizeof(host), &port, resource,
-                 sizeof(resource));
+/*
+ * 'cupsdRestartPolling()' - Restart polling servers as needed.
+ */
+
+void
+cupsdRestartPolling(void)
+{
+  int                  i;              /* Looping var */
+  cupsd_dirsvc_poll_t  *pollp;         /* Current polling server */
+
+
+  for (i = 0, pollp = Polled; i < NumPolled; i ++, pollp ++)
+    if (pollp->pid)
+      kill(pollp->pid, SIGHUP);
+}
+
+
+/*
+ * 'cupsdSaveRemoteCache()' - Save the remote printer cache.
+ */
+
+void
+cupsdSaveRemoteCache(void)
+{
+  int                  i;              /* Looping var */
+  cups_file_t          *fp;            /* printers.conf file */
+  char                 temp[1024];     /* Temporary string */
+  cupsd_printer_t      *printer;       /* Current printer class */
+  time_t               curtime;        /* Current time */
+  struct tm            *curdate;       /* Current date */
+  cups_option_t                *option;        /* Current option */
+
 
  /*
-  * Determine if the URI contains any illegal characters in it...
+  * Create the remote.cache file...
   */
 
-  if (strncmp(uri, "ipp://", 6) || !host[0] ||
-      (strncmp(resource, "/printers/", 10) &&
-       strncmp(resource, "/classes/", 9)))
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "cupsdProcessBrowseData: Bad printer URI in browse data: %s",
-                    uri);
-    return;
-  }
+  snprintf(temp, sizeof(temp), "%s/remote.cache", CacheDir);
 
-  if (strchr(resource, '?') ||
-      (!strncmp(resource, "/printers/", 10) && strchr(resource + 10, '/')) ||
-      (!strncmp(resource, "/classes/", 9) && strchr(resource + 9, '/')))
+  if ((fp = cupsFileOpen(temp, "w")) == NULL)
   {
     cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "cupsdProcessBrowseData: Bad resource in browse data: %s",
-                    resource);
+                    "Unable to save remote.cache - %s", strerror(errno));
     return;
   }
+  else
+    cupsdLogMessage(CUPSD_LOG_DEBUG, "Saving remote.cache...");
 
  /*
-  * OK, this isn't a local printer; add any remote options...
+  * Restrict access to the file...
   */
 
-  ipp_options = cupsGetOption("ipp-options", num_attrs, attrs);
-
-  if (BrowseRemoteOptions)
-  {
-    if (BrowseRemoteOptions[0] == '?')
-    {
-     /*
-      * Override server-supplied options...
-      */
-
-      snprintf(finaluri, sizeof(finaluri), "%s%s", uri, BrowseRemoteOptions);
-    }
-    else if (ipp_options)
-    {
-     /*
-      * Combine the server and local options...
-      */
-
-      snprintf(finaluri, sizeof(finaluri), "%s?%s+%s", uri, ipp_options,
-               BrowseRemoteOptions);
-    }
-    else
-    {
-     /*
-      * Just use the local options...
-      */
+  fchown(cupsFileNumber(fp), getuid(), Group);
+  fchmod(cupsFileNumber(fp), ConfigFilePerm);
 
-      snprintf(finaluri, sizeof(finaluri), "%s?%s", uri, BrowseRemoteOptions);
-    }
+ /*
+  * Write a small header to the file...
+  */
 
-    uri = finaluri;
-  }
-  else if (ipp_options)
-  {
-   /*
-    * Just use the server-supplied options...
-    */
+  curtime = time(NULL);
+  curdate = localtime(&curtime);
+  strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
-    snprintf(finaluri, sizeof(finaluri), "%s?%s", uri, ipp_options);
-    uri = finaluri;
-  }
+  cupsFilePuts(fp, "# Remote cache file for " CUPS_SVERSION "\n");
+  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
 
  /*
-  * See if we already have it listed in the Printers list, and add it if not...
+  * Write each local printer known to the system...
   */
 
-  type   |= CUPS_PRINTER_REMOTE;
-  type   &= ~CUPS_PRINTER_IMPLICIT;
-  update = 0;
-  hptr   = strchr(host, '.');
-  sptr   = strchr(ServerName, '.');
-
-  if (sptr != NULL && hptr != NULL)
+  for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
+       printer;
+       printer = (cupsd_printer_t *)cupsArrayNext(Printers))
   {
    /*
-    * Strip the common domain name components...
+    * Skip local destinations...
     */
 
-    while (hptr != NULL)
-    {
-      if (!strcasecmp(hptr, sptr))
-      {
-        *hptr = '\0';
-       break;
-      }
-      else
-        hptr = strchr(hptr + 1, '.');
-    }
-  }
+    if (!(printer->type & CUPS_PRINTER_DISCOVERED))
+      continue;
 
-  if (type & CUPS_PRINTER_CLASS)
-  {
    /*
-    * Remote destination is a class...
+    * Write printers as needed...
     */
 
-    if (!strncmp(resource, "/classes/", 9))
-      snprintf(name, sizeof(name), "%s@%s", resource + 9, host);
+    if (printer == DefaultPrinter)
+      cupsFilePuts(fp, "<Default");
     else
-      return;
+      cupsFilePutChar(fp, '<');
 
-    if ((p = cupsdFindClass(name)) == NULL && BrowseShortNames)
-    {
-      if ((p = cupsdFindClass(resource + 9)) != NULL)
-      {
-        if (p->hostname && strcasecmp(p->hostname, host))
-       {
-        /*
-         * Nope, this isn't the same host; if the hostname isn't the local host,
-         * add it to the other class and then find a class using the full host
-         * name...
-         */
+    if (printer->type & CUPS_PRINTER_CLASS)
+      cupsFilePrintf(fp, "Class %s>\n", printer->name);
+    else
+      cupsFilePrintf(fp, "Printer %s>\n", printer->name);
 
-         if (p->type & CUPS_PRINTER_REMOTE)
-         {
-           cupsdLogMessage(CUPSD_LOG_INFO,
-                           "Renamed remote class \"%s\" to \"%s@%s\"...",
-                           p->name, p->name, p->hostname);
-           cupsdAddEvent(CUPSD_EVENT_PRINTER_DELETED, p, NULL,
+    cupsFilePrintf(fp, "Type %d\n", printer->type);
+
+    cupsFilePrintf(fp, "BrowseTime %d\n", (int)printer->browse_expire);
+
+    if (printer->info)
+      cupsFilePrintf(fp, "Info %s\n", printer->info);
+
+    if (printer->make_model)
+      cupsFilePrintf(fp, "MakeModel %s\n", printer->make_model);
+
+    if (printer->location)
+      cupsFilePrintf(fp, "Location %s\n", printer->location);
+
+    if (printer->device_uri)
+      cupsFilePrintf(fp, "DeviceURI %s\n", printer->device_uri);
+
+    if (printer->state == IPP_PRINTER_STOPPED)
+    {
+      cupsFilePuts(fp, "State Stopped\n");
+      cupsFilePrintf(fp, "StateMessage %s\n", printer->state_message);
+    }
+    else
+      cupsFilePuts(fp, "State Idle\n");
+
+    if (printer->accepting)
+      cupsFilePuts(fp, "Accepting Yes\n");
+    else
+      cupsFilePuts(fp, "Accepting No\n");
+
+    cupsFilePrintf(fp, "JobSheets %s %s\n", printer->job_sheets[0],
+            printer->job_sheets[1]);
+
+    for (i = 0; i < printer->num_users; i ++)
+      cupsFilePrintf(fp, "%sUser %s\n", printer->deny_users ? "Deny" : "Allow",
+              printer->users[i]);
+
+    for (i = printer->num_options, option = printer->options;
+         i > 0;
+        i --, option ++)
+      cupsFilePrintf(fp, "Option %s %s\n", option->name, option->value);
+
+    if (printer->type & CUPS_PRINTER_CLASS)
+      cupsFilePuts(fp, "</Class>\n");
+    else
+      cupsFilePuts(fp, "</Printer>\n");
+  }
+
+  cupsFileClose(fp);
+}
+
+
+/*
+ * 'cupsdSendBrowseList()' - Send new browsing information as necessary.
+ */
+
+void
+cupsdSendBrowseList(void)
+{
+  int                  count;          /* Number of dests to update */
+  cupsd_printer_t      *p;             /* Current printer */
+  time_t               ut,             /* Minimum update time */
+                       to;             /* Timeout time */
+  int                  write_printcap; /* Write the printcap file? */
+
+
+  if (!Browsing || !BrowseLocalProtocols || !Printers)
+    return;
+
+ /*
+  * Compute the update and timeout times...
+  */
+
+  to = time(NULL);
+  ut = to - BrowseInterval;
+
+ /*
+  * Figure out how many printers need an update...
+  */
+
+  if (BrowseInterval > 0)
+  {
+    int        max_count;                      /* Maximum number to update */
+
+
+   /*
+    * Throttle the number of printers we'll be updating this time
+    * around based on the number of queues that need updating and
+    * the maximum number of queues to update each second...
+    */
+
+    max_count = 2 * cupsArrayCount(Printers) / BrowseInterval + 1;
+
+    for (count = 0, p = (cupsd_printer_t *)cupsArrayFirst(Printers);
+         count < max_count && p != NULL;
+        p = (cupsd_printer_t *)cupsArrayNext(Printers))
+      if (!(p->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) &&
+          p->shared && p->browse_time < ut)
+        count ++;
+
+   /*
+    * Loop through all of the printers and send local updates as needed...
+    */
+
+    if (BrowseNext)
+      p = (cupsd_printer_t *)cupsArrayFind(Printers, BrowseNext);
+    else
+      p = (cupsd_printer_t *)cupsArrayFirst(Printers);
+
+    for (;
+         count > 0;
+        p = (cupsd_printer_t *)cupsArrayNext(Printers))
+    {
+     /*
+      * Check for wraparound...
+      */
+
+      if (!p)
+        p = (cupsd_printer_t *)cupsArrayFirst(Printers);
+
+      if (!p)
+        break;
+      else if ((p->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) ||
+               !p->shared)
+        continue;
+      else if (p->browse_time < ut)
+      {
+       /*
+       * Need to send an update...
+       */
+
+       count --;
+
+       p->browse_time = time(NULL);
+
+       if ((BrowseLocalProtocols & BROWSE_CUPS) && BrowseSocket >= 0)
+          send_cups_browse(p);
+
+#ifdef HAVE_LIBSLP
+       if (BrowseLocalProtocols & BROWSE_SLP)
+          send_slp_browse(p);
+#endif /* HAVE_LIBSLP */
+
+#ifdef HAVE_LDAP
+       if (BrowseLocalProtocols & BROWSE_LDAP)
+          send_ldap_browse(p);
+#endif /* HAVE_LDAP */
+      }
+    }
+
+   /*
+    * Save where we left off so that all printers get updated...
+    */
+
+    BrowseNext = p;
+  }
+
+ /*
+  * Loop through all of the printers and send local updates as needed...
+  */
+
+  for (p = (cupsd_printer_t *)cupsArrayFirst(Printers), write_printcap = 0;
+       p;
+       p = (cupsd_printer_t *)cupsArrayNext(Printers))
+  {
+   /*
+    * If this is a remote queue, see if it needs to be timed out...
+    */
+
+    if (p->type & CUPS_PRINTER_DISCOVERED)
+    {
+      if (p->browse_expire < to)
+      {
+       cupsdAddEvent(CUPSD_EVENT_PRINTER_DELETED, p, NULL,
+                      "%s \'%s\' deleted by directory services (timeout).",
+                     (p->type & CUPS_PRINTER_CLASS) ? "Class" : "Printer",
+                     p->name);
+
+        cupsdLogMessage(CUPSD_LOG_DEBUG,
+                       "Remote destination \"%s\" has timed out; "
+                       "deleting it...",
+                       p->name);
+
+        cupsArraySave(Printers);
+        cupsdDeletePrinter(p, 1);
+        cupsArrayRestore(Printers);
+       write_printcap = 1;
+      }
+    }
+  }
+
+  if (write_printcap)
+    cupsdWritePrintcap();
+}
+
+
+/*
+ * 'cupsdStartBrowsing()' - Start sending and receiving broadcast information.
+ */
+
+void
+cupsdStartBrowsing(void)
+{
+  int                  val;            /* Socket option value */
+  struct sockaddr_in   addr;           /* Broadcast address */
+  cupsd_printer_t      *p;             /* Current printer */
+
+
+  BrowseNext = NULL;
+
+  if (!Browsing || !(BrowseLocalProtocols | BrowseRemoteProtocols))
+    return;
+
+  if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_CUPS)
+  {
+    if (BrowseSocket < 0)
+    {
+     /*
+      * Create the broadcast socket...
+      */
+
+      if ((BrowseSocket = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+      {
+       cupsdLogMessage(CUPSD_LOG_ERROR,
+                       "Unable to create broadcast socket - %s.",
+                       strerror(errno));
+       BrowseLocalProtocols &= ~BROWSE_CUPS;
+       BrowseRemoteProtocols &= ~BROWSE_CUPS;
+       return;
+      }
+
+     /*
+      * Bind the socket to browse port...
+      */
+
+      memset(&addr, 0, sizeof(addr));
+      addr.sin_addr.s_addr = htonl(INADDR_ANY);
+      addr.sin_family      = AF_INET;
+      addr.sin_port        = htons(BrowsePort);
+
+      if (bind(BrowseSocket, (struct sockaddr *)&addr, sizeof(addr)))
+      {
+       cupsdLogMessage(CUPSD_LOG_ERROR,
+                       "Unable to bind broadcast socket - %s.",
+                       strerror(errno));
+
+#ifdef WIN32
+       closesocket(BrowseSocket);
+#else
+       close(BrowseSocket);
+#endif /* WIN32 */
+
+       BrowseSocket = -1;
+       BrowseLocalProtocols &= ~BROWSE_CUPS;
+       BrowseRemoteProtocols &= ~BROWSE_CUPS;
+       return;
+      }
+    }
+
+   /*
+    * Set the "broadcast" flag...
+    */
+
+    val = 1;
+    if (setsockopt(BrowseSocket, SOL_SOCKET, SO_BROADCAST, &val, sizeof(val)))
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to set broadcast mode - %s.",
+                     strerror(errno));
+
+#ifdef WIN32
+      closesocket(BrowseSocket);
+#else
+      close(BrowseSocket);
+#endif /* WIN32 */
+
+      BrowseSocket = -1;
+      BrowseLocalProtocols &= ~BROWSE_CUPS;
+      BrowseRemoteProtocols &= ~BROWSE_CUPS;
+      return;
+    }
+
+   /*
+    * Close the socket on exec...
+    */
+
+    fcntl(BrowseSocket, F_SETFD, fcntl(BrowseSocket, F_GETFD) | FD_CLOEXEC);
+
+   /*
+    * Finally, add the socket to the input selection set as needed...
+    */
+
+    if (BrowseRemoteProtocols & BROWSE_CUPS)
+    {
+     /*
+      * We only listen if we want remote printers...
+      */
+
+      cupsdAddSelect(BrowseSocket, (cupsd_selfunc_t)update_cups_browse,
+                     NULL, NULL);
+    }
+  }
+  else
+    BrowseSocket = -1;
+
+#ifdef HAVE_LIBSLP
+  if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP)
+  {
+   /* 
+    * Open SLP handle...
+    */
+
+    if (SLPOpen("en", SLP_FALSE, &BrowseSLPHandle) != SLP_OK)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "Unable to open an SLP handle; disabling SLP browsing!");
+      BrowseLocalProtocols &= ~BROWSE_SLP;
+      BrowseRemoteProtocols &= ~BROWSE_SLP;
+    }
+
+    BrowseSLPRefresh = 0;
+  }
+  else
+    BrowseSLPHandle = NULL;
+#endif /* HAVE_LIBSLP */
+
+#ifdef HAVE_OPENLDAP
+  if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_LDAP)
+  {
+    if (!BrowseLDAPDN)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "Need to set BrowseLDAPDN to use LDAP browsing!");
+      BrowseLocalProtocols &= ~BROWSE_LDAP;
+      BrowseRemoteProtocols &= ~BROWSE_LDAP;
+    }
+    else
+    {
+     /* 
+      * Open LDAP handle...
+      */
+
+      int              rc;             /* LDAP API status */
+      int              version = 3;    /* LDAP version */
+      struct berval    bv = {0, ""};   /* SASL bind value */
+
+
+     /*
+      * Set the certificate file to use for encrypted LDAP sessions...
+      */
+
+      if (BrowseLDAPCACertFile)
+      {
+       cupsdLogMessage(CUPSD_LOG_DEBUG,
+                       "cupsdStartBrowsing: Setting CA certificate file \"%s\"",
+                       BrowseLDAPCACertFile);
+
+        if ((rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTFILE,
+                                 (void *)BrowseLDAPCACertFile))
+               != LDAP_SUCCESS)
+          cupsdLogMessage(CUPSD_LOG_ERROR,
+                          "Unable to set CA certificate file for LDAP "
+                         "connections: %d - %s", rc, ldap_err2string(rc));
+      }
+
+     /*
+      * LDAP stuff currently only supports ldapi EXTERNAL SASL binds...
+      */
+
+      if (!BrowseLDAPServer || !strcasecmp(BrowseLDAPServer, "localhost")) 
+        rc = ldap_initialize(&BrowseLDAPHandle, "ldapi:///");
+      else     
+       rc = ldap_initialize(&BrowseLDAPHandle, BrowseLDAPServer);
+
+      if (rc != LDAP_SUCCESS)
+      {
+       cupsdLogMessage(CUPSD_LOG_ERROR,
+                       "Unable to initialize LDAP; disabling LDAP browsing!");
+       BrowseLocalProtocols &= ~BROWSE_LDAP;
+       BrowseRemoteProtocols &= ~BROWSE_LDAP;
+      }
+      else if (ldap_set_option(BrowseLDAPHandle, LDAP_OPT_PROTOCOL_VERSION,
+                               (const void *)&version) != LDAP_SUCCESS)
+      {
+       ldap_unbind_ext(BrowseLDAPHandle, NULL, NULL);
+       BrowseLDAPHandle = NULL;
+       cupsdLogMessage(CUPSD_LOG_ERROR,
+                       "Unable to set LDAP protocol version; "
+                       "disabling LDAP browsing!");
+       BrowseLocalProtocols &= ~BROWSE_LDAP;
+       BrowseRemoteProtocols &= ~BROWSE_LDAP;
+      }
+      else
+      {
+       if (!BrowseLDAPServer || !strcasecmp(BrowseLDAPServer, "localhost"))
+         rc = ldap_sasl_bind_s(BrowseLDAPHandle, NULL, "EXTERNAL", &bv, NULL,
+                               NULL, NULL);
+       else
+         rc = ldap_bind_s(BrowseLDAPHandle, BrowseLDAPBindDN,
+                          BrowseLDAPPassword, LDAP_AUTH_SIMPLE);
+
+       if (rc != LDAP_SUCCESS)
+       {
+         cupsdLogMessage(CUPSD_LOG_ERROR,
+                         "Unable to bind to LDAP server; "
+                         "disabling LDAP browsing!");
+         ldap_unbind_ext(BrowseLDAPHandle, NULL, NULL);
+         BrowseLocalProtocols &= ~BROWSE_LDAP;
+         BrowseRemoteProtocols &= ~BROWSE_LDAP;
+       }
+      }
+    }
+
+    BrowseLDAPRefresh = 0;
+  }
+#endif /* HAVE_OPENLDAP */
+
+ /*
+  * Enable LPD and SMB printer sharing as needed through external programs...
+  */
+
+  if (BrowseLocalProtocols & BROWSE_LPD)
+    update_lpd(1);
+
+  if (BrowseLocalProtocols & BROWSE_SMB)
+    update_smb(1);
+
+ /*
+  * Register the individual printers
+  */
+
+  for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
+       p;
+       p = (cupsd_printer_t *)cupsArrayNext(Printers))
+    if (!(p->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)))
+      cupsdRegisterPrinter(p);
+}
+
+
+/*
+ * 'cupsdStartPolling()' - Start polling servers as needed.
+ */
+
+void
+cupsdStartPolling(void)
+{
+  int                  i;              /* Looping var */
+  cupsd_dirsvc_poll_t  *pollp;         /* Current polling server */
+  char                 polld[1024];    /* Poll daemon path */
+  char                 sport[255];     /* Server port */
+  char                 bport[255];     /* Browser port */
+  char                 interval[255];  /* Poll interval */
+  int                  statusfds[2];   /* Status pipe */
+  char                 *argv[6];       /* Arguments */
+  char                 *envp[100];     /* Environment */
+
+
+ /*
+  * Don't do anything if we aren't polling...
+  */
+
+  if (NumPolled == 0 || BrowseSocket < 0)
+  {
+    PollPipe         = -1;
+    PollStatusBuffer = NULL;
+    return;
+  }
+
+ /*
+  * Setup string arguments for polld, port and interval options.
+  */
+
+  snprintf(polld, sizeof(polld), "%s/daemon/cups-polld", ServerBin);
+
+  sprintf(bport, "%d", BrowsePort);
+
+  if (BrowseInterval)
+    sprintf(interval, "%d", BrowseInterval);
+  else
+    strcpy(interval, "30");
+
+  argv[0] = "cups-polld";
+  argv[2] = sport;
+  argv[3] = interval;
+  argv[4] = bport;
+  argv[5] = NULL;
+
+  cupsdLoadEnv(envp, (int)(sizeof(envp) / sizeof(envp[0])));
+
+ /*
+  * Create a pipe that receives the status messages from each
+  * polling daemon...
+  */
+
+  if (cupsdOpenPipe(statusfds))
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "Unable to create polling status pipes - %s.",
+                   strerror(errno));
+    PollPipe         = -1;
+    PollStatusBuffer = NULL;
+    return;
+  }
+
+  PollPipe         = statusfds[0];
+  PollStatusBuffer = cupsdStatBufNew(PollPipe, "[Poll]");
+
+ /*
+  * Run each polling daemon, redirecting stderr to the polling pipe...
+  */
+
+  for (i = 0, pollp = Polled; i < NumPolled; i ++, pollp ++)
+  {
+    sprintf(sport, "%d", pollp->port);
+
+    argv[1] = pollp->hostname;
+
+    if (cupsdStartProcess(polld, argv, envp, -1, -1, statusfds[1], -1, -1,
+                          0, &(pollp->pid)) < 0)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "cupsdStartPolling: Unable to fork polling daemon - %s",
+                      strerror(errno));
+      pollp->pid = 0;
+      break;
+    }
+    else
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
+                      "cupsdStartPolling: Started polling daemon for %s:%d, pid = %d",
+                      pollp->hostname, pollp->port, pollp->pid);
+  }
+
+  close(statusfds[1]);
+
+ /*
+  * Finally, add the pipe to the input selection set...
+  */
+
+  cupsdAddSelect(PollPipe, (cupsd_selfunc_t)update_polling, NULL, NULL);
+}
+
+
+/*
+ * 'cupsdStopBrowsing()' - Stop sending and receiving broadcast information.
+ */
+
+void
+cupsdStopBrowsing(void)
+{
+  cupsd_printer_t      *p;             /* Current printer */
+
+
+  if (!Browsing || !(BrowseLocalProtocols | BrowseRemoteProtocols))
+    return;
+
+ /*
+  * De-register the individual printers
+  */
+
+  for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
+       p;
+       p = (cupsd_printer_t *)cupsArrayNext(Printers))
+    if (!(p->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)))
+      cupsdDeregisterPrinter(p, 1);
+
+ /*
+  * Shut down browsing sockets...
+  */
+
+  if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_CUPS) &&
+      BrowseSocket >= 0)
+  {
+   /*
+    * Close the socket and remove it from the input selection set.
+    */
+
+#ifdef WIN32
+    closesocket(BrowseSocket);
+#else
+    close(BrowseSocket);
+#endif /* WIN32 */
+
+    cupsdRemoveSelect(BrowseSocket);
+    BrowseSocket = -1;
+  }
+
+#ifdef HAVE_LIBSLP
+  if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) &&
+      BrowseSLPHandle)
+  {
+   /* 
+    * Close SLP handle...
+    */
+
+    SLPClose(BrowseSLPHandle);
+    BrowseSLPHandle = NULL;
+  }
+#endif /* HAVE_LIBSLP */
+
+#ifdef HAVE_OPENLDAP
+  if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_LDAP) &&
+      BrowseLDAPHandle)
+  {
+    ldap_unbind(BrowseLDAPHandle);
+    BrowseLDAPHandle = NULL;
+  }
+#endif /* HAVE_OPENLDAP */
+
+ /*
+  * Disable LPD and SMB printer sharing as needed through external programs...
+  */
+
+  if (BrowseLocalProtocols & BROWSE_LPD)
+    update_lpd(0);
+
+  if (BrowseLocalProtocols & BROWSE_SMB)
+    update_smb(0);
+}
+
+
+/*
+ * 'cupsdStopPolling()' - Stop polling servers as needed.
+ */
+
+void
+cupsdStopPolling(void)
+{
+  int                  i;              /* Looping var */
+  cupsd_dirsvc_poll_t  *pollp;         /* Current polling server */
+
+
+  if (PollPipe >= 0)
+  {
+    cupsdStatBufDelete(PollStatusBuffer);
+    close(PollPipe);
+
+    cupsdRemoveSelect(PollPipe);
+
+    PollPipe         = -1;
+    PollStatusBuffer = NULL;
+  }
+
+  for (i = 0, pollp = Polled; i < NumPolled; i ++, pollp ++)
+    if (pollp->pid)
+      cupsdEndProcess(pollp->pid, 0);
+}
+
+
+#ifdef HAVE_DNSSD
+/*
+ * 'cupsdUpdateDNSSDBrowse()' - Handle DNS-SD queries.
+ */
+
+void
+cupsdUpdateDNSSDBrowse(
+    cupsd_printer_t *p)                        /* I - Printer being queried */
+{
+  DNSServiceErrorType  sdErr;          /* Service discovery error */
+
+
+  if ((sdErr = DNSServiceProcessResult(p->dnssd_ipp_ref))
+          != kDNSServiceErr_NoError)
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "DNS Service Discovery registration error %d for \"%s\"!",
+                   sdErr, p->name);
+    cupsdRemoveSelect(p->dnssd_ipp_fd);
+    DNSServiceRefDeallocate(p->dnssd_ipp_ref);
+
+    p->dnssd_ipp_ref = NULL;
+    p->dnssd_ipp_fd  = -1;
+  }
+}
+#endif /* HAVE_DNSSD */
+
+
+#ifdef HAVE_OPENLDAP
+/*
+ * 'cupsdUpdateLDAPBrowse()' - Scan for new printers via LDAP...
+ */
+
+void
+cupsdUpdateLDAPBrowse(void)
+{
+  char         uri[HTTP_MAX_URI],      /* Printer URI */
+               host[HTTP_MAX_URI],     /* Hostname */
+               resource[HTTP_MAX_URI], /* Resource path */
+               location[1024],         /* Printer location */
+               info[1024],             /* Printer information */
+               make_model[1024],       /* Printer make and model */
+               **value;                /* Holds the returned data from LDAP */
+  int          type;                   /* Printer type */
+  int          rc;                     /* LDAP status */
+  int          limit;                  /* Size limit */
+  LDAPMessage  *res,                   /* LDAP search results */
+                 *e;                   /* Current entry from search */
+
+
+ /*
+  * Search for printers...
+  */
+
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "UpdateLDAPBrowse: %s", ServerName);
+
+  BrowseLDAPRefresh = time(NULL) + BrowseInterval;
+
+  rc = ldap_search_s(BrowseLDAPHandle, BrowseLDAPDN, LDAP_SCOPE_SUBTREE,
+                     "(objectclass=cupsPrinter)", (char **)ldap_attrs, 0, &res);
+  if (rc != LDAP_SUCCESS) 
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "LDAP search returned error %d: %s", rc,
+                   ldap_err2string(rc));
+    return;
+  }
+
+  limit = ldap_count_entries(BrowseLDAPHandle, res);
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "LDAP search returned %d entries", limit);
+  if (limit < 1)
+    return;
+
+ /*
+  * Loop through the available printers...
+  */
+
+  for (e = ldap_first_entry(BrowseLDAPHandle, res);
+       e;
+       e = ldap_next_entry(BrowseLDAPHandle, e))
+  {
+   /*
+    * Get the required values from this entry...
+    */
+
+    if ((value = ldap_get_values(BrowseLDAPHandle, e,
+                                 "printerDescription")) == NULL)
+      continue;
+
+    strlcpy(info, *value, sizeof(info));
+    ldap_value_free(value);
+
+    if ((value = ldap_get_values(BrowseLDAPHandle, e,
+                                 "printerLocation")) == NULL)
+      continue;
+
+    strlcpy(location, *value, sizeof(location));
+    ldap_value_free(value);
+
+    if ((value = ldap_get_values(BrowseLDAPHandle, e,
+                                 "printerMakeAndModel")) == NULL)
+      continue;
+
+    strlcpy(make_model, *value, sizeof(make_model));
+    ldap_value_free(value);
+
+    if ((value = ldap_get_values(BrowseLDAPHandle, e,
+                                 "printerType")) == NULL)
+      continue;
+
+    type = atoi(*value);
+    ldap_value_free(value);
+
+    if ((value = ldap_get_values(BrowseLDAPHandle, e,
+                                 "printerURI")) == NULL)
+      continue;
+
+    strlcpy(uri, *value, sizeof(uri));
+    ldap_value_free(value);
+
+   /*
+    * Process the entry as browse data...
+    */
+
+    if (!is_local_queue(uri, host, sizeof(host), resource, sizeof(resource)))
+      process_browse_data(uri, host, resource, type, IPP_PRINTER_IDLE,
+                          location, info, make_model, 0, NULL);
+
+  }
+}
+#endif /* HAVE_OPENLDAP */
+
+
+#ifdef HAVE_LIBSLP 
+/*
+ * 'cupsdUpdateSLPBrowse()' - Get browsing information via SLP.
+ */
+
+void
+cupsdUpdateSLPBrowse(void)
+{
+  slpsrvurl_t  *s,                     /* Temporary list of service URLs */
+               *next;                  /* Next service in list */
+  cupsd_printer_t p;                   /* Printer information */
+  const char   *uri;                   /* Pointer to printer URI */
+  char         host[HTTP_MAX_URI],     /* Host portion of URI */
+               resource[HTTP_MAX_URI]; /* Resource portion of URI */
+
+
+ /*
+  * Reset the refresh time...
+  */
+
+  BrowseSLPRefresh = time(NULL) + BrowseInterval;
+
+ /* 
+  * Poll for remote printers using SLP...
+  */
+
+  s = NULL;
+
+  SLPFindSrvs(BrowseSLPHandle, SLP_CUPS_SRVTYPE, "", "",
+             slp_url_callback, &s);
+
+ /*
+  * Loop through the list of available printers...
+  */
+
+  for (; s; s = next)
+  {
+   /*
+    * Save the "next" pointer...
+    */
+
+    next = s->next;
+
+   /* 
+    * Load a cupsd_printer_t structure with the SLP service attributes...
+    */
+
+    SLPFindAttrs(BrowseSLPHandle, s->url, "", "", slp_attr_callback, &p);
+
+   /*
+    * Process this printer entry...
+    */
+
+    uri = s->url + SLP_CUPS_SRVLEN + 1;
+
+    if (!strncmp(uri, "http://", 7) || !strncmp(uri, "ipp://", 6))
+    {
+     /*
+      * Pull the URI apart to see if this is a local or remote printer...
+      */
+
+      if (!is_local_queue(uri, host, sizeof(host), resource, sizeof(resource)))
+        process_browse_data(uri, host, resource, p.type, IPP_PRINTER_IDLE,
+                           p.location,  p.info, p.make_model, 0, NULL);
+    }
+
+   /*
+    * Free this listing...
+    */
+
+    cupsdClearString(&p.info);
+    cupsdClearString(&p.location);
+    cupsdClearString(&p.make_model);
+
+    free(s);
+  }       
+}
+#endif /* HAVE_LIBSLP */
+
+
+/*
+ * 'dequote()' - Remote quotes from a string.
+ */
+
+static char *                          /* O - Dequoted string */
+dequote(char       *d,                 /* I - Destination string */
+        const char *s,                 /* I - Source string */
+       int        dlen)                /* I - Destination length */
+{
+  char *dptr;                          /* Pointer into destination */
+
+
+  if (s)
+  {
+    for (dptr = d, dlen --; *s && dlen > 0; s ++)
+      if (*s != '\"')
+      {
+       *dptr++ = *s;
+       dlen --;
+      }
+
+    *dptr = '\0';
+  }
+  else
+    *d = '\0';
+
+  return (d);
+}
+
+
+/*
+ * 'is_local_queue()' - Determine whether the URI points at a local queue.
+ */
+
+static int                             /* O - 1 = local, 0 = remote, -1 = bad URI */
+is_local_queue(const char *uri,                /* I - Printer URI */
+               char       *host,       /* O - Host string */
+              int        hostlen,      /* I - Length of host buffer */
+               char       *resource,   /* O - Resource string */
+              int        resourcelen)  /* I - Length of resource buffer */
+{
+  char         scheme[32],             /* Scheme portion of URI */
+               username[HTTP_MAX_URI]; /* Username portion of URI */
+  int          port;                   /* Port portion of URI */
+  cupsd_netif_t        *iface;                 /* Network interface */
+
+
+ /*
+  * Pull the URI apart to see if this is a local or remote printer...
+  */
+
+  if (httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, sizeof(scheme),
+                      username, sizeof(username), host, hostlen, &port,
+                     resource, resourcelen) < HTTP_URI_OK)
+    return (-1);
+
+  DEBUG_printf(("host=\"%s\", ServerName=\"%s\"\n", host, ServerName));
+
+ /*
+  * Check for local server addresses...
+  */
+
+  if (!strcasecmp(host, ServerName) && port == LocalPort)
+    return (1);
+
+  cupsdNetIFUpdate();
+
+  for (iface = (cupsd_netif_t *)cupsArrayFirst(NetIFList);
+       iface;
+       iface = (cupsd_netif_t *)cupsArrayNext(NetIFList))
+    if (!strcasecmp(host, iface->hostname) && port == iface->port)
+      return (1);
+
+ /*
+  * If we get here, the printer is remote...
+  */
+
+  return (0);
+}
+
+
+/*
+ * 'process_browse_data()' - Process new browse data.
+ */
+
+static void
+process_browse_data(
+    const char    *uri,                        /* I - URI of printer/class */
+    const char    *host,               /* I - Hostname */
+    const char    *resource,           /* I - Resource path */
+    cups_ptype_t  type,                        /* I - Printer type */
+    ipp_pstate_t  state,               /* I - Printer state */
+    const char    *location,           /* I - Printer location */
+    const char    *info,               /* I - Printer information */
+    const char    *make_model,         /* I - Printer make and model */
+    int                  num_attrs,            /* I - Number of attributes */
+    cups_option_t *attrs)              /* I - Attributes */
+{
+  int          i;                      /* Looping var */
+  int          update,                 /* Update printer attributes? */
+               write_printcap;         /* Write the printcap file? */
+  char         finaluri[HTTP_MAX_URI], /* Final URI for printer */
+               name[IPP_MAX_NAME],     /* Name of printer */
+               newname[IPP_MAX_NAME],  /* New name of printer */
+               *hptr,                  /* Pointer into hostname */
+               *sptr;                  /* Pointer into ServerName */
+  char         local_make_model[IPP_MAX_NAME];
+                                       /* Local make and model */
+  cupsd_printer_t *p;                  /* Printer information */
+  const char   *ipp_options,           /* ipp-options value */
+               *lease_duration;        /* lease-duration value */
+
+
+ /*
+  * Determine if the URI contains any illegal characters in it...
+  */
+
+  if (strncmp(uri, "ipp://", 6) || !host[0] ||
+      (strncmp(resource, "/printers/", 10) &&
+       strncmp(resource, "/classes/", 9)))
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "process_browse_data: Bad printer URI in browse data: %s",
+                    uri);
+    return;
+  }
+
+  if (strchr(resource, '?') ||
+      (!strncmp(resource, "/printers/", 10) && strchr(resource + 10, '/')) ||
+      (!strncmp(resource, "/classes/", 9) && strchr(resource + 9, '/')))
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "process_browse_data: Bad resource in browse data: %s",
+                    resource);
+    return;
+  }
+
+ /*
+  * OK, this isn't a local printer; add any remote options...
+  */
+
+  ipp_options = cupsGetOption("ipp-options", num_attrs, attrs);
+
+  if (BrowseRemoteOptions)
+  {
+    if (BrowseRemoteOptions[0] == '?')
+    {
+     /*
+      * Override server-supplied options...
+      */
+
+      snprintf(finaluri, sizeof(finaluri), "%s%s", uri, BrowseRemoteOptions);
+    }
+    else if (ipp_options)
+    {
+     /*
+      * Combine the server and local options...
+      */
+
+      snprintf(finaluri, sizeof(finaluri), "%s?%s+%s", uri, ipp_options,
+               BrowseRemoteOptions);
+    }
+    else
+    {
+     /*
+      * Just use the local options...
+      */
+
+      snprintf(finaluri, sizeof(finaluri), "%s?%s", uri, BrowseRemoteOptions);
+    }
+
+    uri = finaluri;
+  }
+  else if (ipp_options)
+  {
+   /*
+    * Just use the server-supplied options...
+    */
+
+    snprintf(finaluri, sizeof(finaluri), "%s?%s", uri, ipp_options);
+    uri = finaluri;
+  }
+
+ /*
+  * See if we already have it listed in the Printers list, and add it if not...
+  */
+
+  type           |= CUPS_PRINTER_REMOTE | CUPS_PRINTER_DISCOVERED;
+  type           &= ~CUPS_PRINTER_IMPLICIT;
+  update         = 0;
+  write_printcap = 0;
+  hptr           = strchr(host, '.');
+  sptr           = strchr(ServerName, '.');
+
+  if (!ServerNameIsIP && sptr != NULL && hptr != NULL)
+  {
+   /*
+    * Strip the common domain name components...
+    */
+
+    while (hptr != NULL)
+    {
+      if (!strcasecmp(hptr, sptr))
+      {
+        *hptr = '\0';
+       break;
+      }
+      else
+        hptr = strchr(hptr + 1, '.');
+    }
+  }
+
+  if (type & CUPS_PRINTER_CLASS)
+  {
+   /*
+    * Remote destination is a class...
+    */
+
+    if (!strncmp(resource, "/classes/", 9))
+      snprintf(name, sizeof(name), "%s@%s", resource + 9, host);
+    else
+      return;
+
+    if (hptr && !*hptr)
+      *hptr = '.';                     /* Resource FQDN */
+
+    if ((p = cupsdFindClass(name)) == NULL && BrowseShortNames)
+    {
+      if ((p = cupsdFindClass(resource + 9)) != NULL)
+      {
+        if (p->hostname && strcasecmp(p->hostname, host))
+       {
+        /*
+         * Nope, this isn't the same host; if the hostname isn't the local host,
+         * add it to the other class and then find a class using the full host
+         * name...
+         */
+
+         if (p->type & CUPS_PRINTER_REMOTE)
+         {
+           cupsdLogMessage(CUPSD_LOG_DEBUG,
+                           "Renamed remote class \"%s\" to \"%s@%s\"...",
+                           p->name, p->name, p->hostname);
+           cupsdAddEvent(CUPSD_EVENT_PRINTER_DELETED, p, NULL,
                          "Class \'%s\' deleted by directory services.",
                          p->name);
 
-            cupsArrayRemove(Printers, p);
-            cupsdSetStringf(&p->name, "%s@%s", p->name, p->hostname);
-           cupsdSetPrinterAttrs(p);
-           cupsArrayAdd(Printers, p);
+            snprintf(newname, sizeof(newname), "%s@%s", p->name, p->hostname);
+            cupsdRenamePrinter(p, newname);
 
            cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED, p, NULL,
                          "Class \'%s\' added by directory services.",
@@ -647,7 +1891,7 @@ cupsdProcessBrowseData(
 
       p = cupsdAddClass(name);
 
-      cupsdLogMessage(CUPSD_LOG_INFO, "Added remote class \"%s\"...", name);
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Added remote class \"%s\"...", name);
 
       cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED, p, NULL,
                     "Class \'%s\' added by directory services.", name);
@@ -662,7 +1906,8 @@ cupsdProcessBrowseData(
       cupsdSetString(&p->device_uri, uri);
       cupsdSetString(&p->hostname, host);
 
-      update = 1;
+      update         = 1;
+      write_printcap = 1;
     }
   }
   else
@@ -671,11 +1916,14 @@ cupsdProcessBrowseData(
     * Remote destination is a printer...
     */
 
-    if (strncmp(resource, "/printers/", 10) == 0)
+    if (!strncmp(resource, "/printers/", 10))
       snprintf(name, sizeof(name), "%s@%s", resource + 10, host);
     else
       return;
 
+    if (hptr && !*hptr)
+      *hptr = '.';                     /* Resource FQDN */
+
     if ((p = cupsdFindPrinter(name)) == NULL && BrowseShortNames)
     {
       if ((p = cupsdFindPrinter(resource + 10)) != NULL)
@@ -690,17 +1938,15 @@ cupsdProcessBrowseData(
 
          if (p->type & CUPS_PRINTER_REMOTE)
          {
-           cupsdLogMessage(CUPSD_LOG_INFO,
+           cupsdLogMessage(CUPSD_LOG_DEBUG,
                            "Renamed remote printer \"%s\" to \"%s@%s\"...",
                            p->name, p->name, p->hostname);
            cupsdAddEvent(CUPSD_EVENT_PRINTER_DELETED, p, NULL,
                          "Printer \'%s\' deleted by directory services.",
                          p->name);
 
-           cupsArrayRemove(Printers, p);
-           cupsdSetStringf(&p->name, "%s@%s", p->name, p->hostname);
-           cupsdSetPrinterAttrs(p);
-           cupsArrayAdd(Printers, p);
+            snprintf(newname, sizeof(newname), "%s@%s", p->name, p->hostname);
+            cupsdRenamePrinter(p, newname);
 
            cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED, p, NULL,
                          "Printer \'%s\' added by directory services.",
@@ -755,7 +2001,7 @@ cupsdProcessBrowseData(
       cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED, p, NULL,
                     "Printer \'%s\' added by directory services.", name);
 
-      cupsdLogMessage(CUPSD_LOG_INFO, "Added remote printer \"%s\"...", name);
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "Added remote printer \"%s\"...", name);
 
      /*
       * Force the URI to point to the real server...
@@ -767,7 +2013,8 @@ cupsdProcessBrowseData(
       cupsdSetString(&p->uri, uri);
       cupsdSetString(&p->device_uri, uri);
 
-      update = 1;
+      write_printcap = 1;
+      update         = 1;
     }
   }
 
@@ -778,6 +2025,23 @@ cupsdProcessBrowseData(
   p->state       = state;
   p->browse_time = time(NULL);
 
+  if ((lease_duration = cupsGetOption("lease-duration", num_attrs,
+                                      attrs)) != NULL)
+  {
+   /*
+    * Grab the lease-duration for the browse data; anything less then 1
+    * second or more than 1 week gets the default BrowseTimeout...
+    */
+
+    i = atoi(lease_duration);
+    if (i < 1 || i > 604800)
+      i = BrowseTimeout;
+
+    p->browse_expire = p->browse_time + i;
+  }
+  else
+    p->browse_expire = p->browse_time + BrowseTimeout;
+
   if (type & CUPS_PRINTER_REJECTING)
   {
     type &= ~CUPS_PRINTER_REJECTING;
@@ -809,7 +2073,8 @@ cupsdProcessBrowseData(
   if (info && (!p->info || strcmp(p->info, info)))
   {
     cupsdSetString(&p->info, info);
-    update = 1;
+    update         = 1;
+    write_printcap = 1;
   }
 
   if (!make_model || !make_model[0])
@@ -831,6 +2096,39 @@ cupsdProcessBrowseData(
     update = 1;
   }
 
+  if (p->num_options)
+  {
+    if (!update && !(type & CUPS_PRINTER_DELETE))
+    {
+     /*
+      * See if we need to update the attributes...
+      */
+
+      if (p->num_options != num_attrs)
+       update = 1;
+      else
+      {
+       for (i = 0; i < num_attrs; i ++)
+          if (strcmp(attrs[i].name, p->options[i].name) ||
+             (!attrs[i].value != !p->options[i].value) ||
+             (attrs[i].value && strcmp(attrs[i].value, p->options[i].value)))
+          {
+           update = 1;
+           break;
+          }
+      }
+    }
+
+   /*
+    * Free the old options...
+    */
+
+    cupsFreeOptions(p->num_options, p->options);
+  }
+
+  p->num_options = num_attrs;
+  p->options     = attrs;
+
   if (type & CUPS_PRINTER_DELETE)
   {
     cupsdAddEvent(CUPSD_EVENT_PRINTER_DELETED, p, NULL,
@@ -841,6 +2139,7 @@ cupsdProcessBrowseData(
  
     cupsdDeletePrinter(p, 1);
     cupsdUpdateImplicitClasses();
+    write_printcap = 1;
   }
   else if (update)
   {
@@ -849,508 +2148,728 @@ cupsdProcessBrowseData(
   }
 
  /*
-  * See if we have a default printer...  If not, make the first printer the
-  * default.
+  * See if we have a default printer...  If not, make the first network
+  * default printer the default.
   */
 
-  if (DefaultPrinter == NULL && Printers != NULL)
-    DefaultPrinter = (cupsd_printer_t *)cupsArrayFirst(Printers);
+  if (DefaultPrinter == NULL && Printers != NULL && UseNetworkDefault)
+  {
+   /*
+    * Find the first network default printer and use it...
+    */
+
+    for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
+         p;
+        p = (cupsd_printer_t *)cupsArrayNext(Printers))
+      if (p->type & CUPS_PRINTER_DEFAULT)
+      {
+        DefaultPrinter = p;
+       write_printcap = 1;
+       break;
+      }
+  }
 
  /*
   * Do auto-classing if needed...
   */
 
-  cupsdProcessImplicitClasses();
+  process_implicit_classes(&write_printcap);
 
  /*
   * Update the printcap file...
   */
 
-  cupsdWritePrintcap();
+  if (write_printcap)
+    cupsdWritePrintcap();
 }
 
 
+#ifdef HAVE_DNSSD
 /*
- * 'cupsdProcessImplicitClasses()' - Create/update implicit classes as needed.
+ * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info.
  */
 
-void
-cupsdProcessImplicitClasses(void)
+static char *                          /* O - TXT record */
+dnssdBuildTxtRecord(
+    int             *txt_len,          /* O - TXT record length */
+    cupsd_printer_t *p)                        /* I - Printer information */
 {
-  int          i;                      /* Looping var */
-  int          update;                 /* Update printer attributes? */
-  char         name[IPP_MAX_NAME],     /* Name of printer */
-               *hptr;                  /* Pointer into hostname */
-  cupsd_printer_t *p,                  /* Printer information */
-               *pclass,                /* Printer class */
-               *first;                 /* First printer in class */
-  int          offset,                 /* Offset of name */
-               len;                    /* Length of name */
+  int          i, j;                   /* Looping vars */
+  char         type_str[32],           /* Type to string buffer */
+               state_str[32],          /* State to string buffer */
+               rp_str[1024],           /* Queue name string buffer */
+               air_str[1024],          /* auth-info-required string buffer */
+               *keyvalue[32][2];       /* Table of key/value pairs */
 
 
-  if (!ImplicitClasses || !Printers)
-    return;
+ /*
+  * Load up the key value pairs...
+  */
+
+  i = 0;
+
+  keyvalue[i  ][0] = "txtvers";
+  keyvalue[i++][1] = "1";
+
+  keyvalue[i  ][0] = "qtotal";
+  keyvalue[i++][1] = "1";
+
+  keyvalue[i  ][0] = "rp";
+  keyvalue[i++][1] = rp_str;
+  snprintf(rp_str, sizeof(rp_str), "%s/%s", 
+          (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers", p->name);
+
+  keyvalue[i  ][0] = "ty";
+  keyvalue[i++][1] = p->make_model;
+
+  if (p->location && *p->location != '\0')
+  {
+    keyvalue[i  ][0] = "note";
+    keyvalue[i++][1] = p->location;
+  }
+
+  keyvalue[i  ][0] = "product";
+  keyvalue[i++][1] = p->product ? p->product : "Unknown";
+
+  snprintf(type_str, sizeof(type_str), "0x%X", p->type | CUPS_PRINTER_REMOTE);
+  snprintf(state_str, sizeof(state_str), "%d", p->state);
+
+  keyvalue[i  ][0] = "printer-state";
+  keyvalue[i++][1] = state_str;
+
+  keyvalue[i  ][0] = "printer-type";
+  keyvalue[i++][1] = type_str;
+
+  keyvalue[i  ][0] = "Transparent";
+  keyvalue[i++][1] = "T";
+
+  keyvalue[i  ][0] = "Binary";
+  keyvalue[i++][1] = "T";
+
+  if ((p->type & CUPS_PRINTER_FAX))
+  {
+    keyvalue[i  ][0] = "Fax";
+    keyvalue[i++][1] = "T";
+  }
+
+  if ((p->type & CUPS_PRINTER_COLOR))
+  {
+    keyvalue[i  ][0] = "Color";
+    keyvalue[i++][1] = "T";
+  }
+
+  if ((p->type & CUPS_PRINTER_DUPLEX))
+  {
+    keyvalue[i  ][0] = "Duplex";
+    keyvalue[i++][1] = "T";
+  }
+
+  if ((p->type & CUPS_PRINTER_STAPLE))
+  {
+    keyvalue[i  ][0] = "Staple";
+    keyvalue[i++][1] = "T";
+  }
+
+  if ((p->type & CUPS_PRINTER_COPIES))
+  {
+    keyvalue[i  ][0] = "Copies";
+    keyvalue[i++][1] = "T";
+  }
+
+  if ((p->type & CUPS_PRINTER_COLLATE))
+  {
+    keyvalue[i  ][0] = "Collate";
+    keyvalue[i++][1] = "T";
+  }
+
+  if ((p->type & CUPS_PRINTER_PUNCH))
+  {
+    keyvalue[i  ][0] = "Punch";
+    keyvalue[i++][1] = "T";
+  }
+
+  if ((p->type & CUPS_PRINTER_BIND))
+  {
+    keyvalue[i  ][0] = "Bind";
+    keyvalue[i++][1] = "T";
+  }
+
+  if ((p->type & CUPS_PRINTER_SORT))
+  {
+    keyvalue[i  ][0] = "Sort";
+    keyvalue[i++][1] = "T";
+  }
+
+  keyvalue[i  ][0] = "pdl";
+  keyvalue[i++][1] = p->pdl ? p->pdl : "application/postscript";
+
+  if (p->num_auth_info_required)
+  {
+    char       *air = air_str;         /* Pointer into string */
+
+
+    for (j = 0; j < p->num_auth_info_required; j ++)
+    {
+      if (air >= (air_str + sizeof(air_str) - 2))
+        break;
+
+      if (j)
+        *air++ = ',';
+
+      strlcpy(air, p->auth_info_required[j], sizeof(air_str) - (air - air_str));
+      air += strlen(air);
+    }
+
+    keyvalue[i  ][0] = "air";
+    keyvalue[i++][1] = air;
+  }
 
  /*
-  * Loop through all available printers and create classes as needed...
+  * Then pack them into a proper txt record...
+  */
+
+  return (dnssdPackTxtRecord(txt_len, keyvalue, i));
+}
+
+
+/*
+ * 'dnssdDeregisterPrinter()' - Stop sending broadcast information for a
+ *                              printer.
+ */
+
+static void
+dnssdDeregisterPrinter(
+    cupsd_printer_t *p)                        /* I - Printer */
+{
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name);
+
+ /*
+  * Closing the socket deregisters the service
   */
 
-  for (p = (cupsd_printer_t *)cupsArrayFirst(Printers), len = 0, offset = 0,
-           update = 0, pclass = NULL, first = NULL;
-       p != NULL;
-       p = (cupsd_printer_t *)cupsArrayNext(Printers))
+  if (p->dnssd_ipp_ref)
   {
-   /*
-    * Skip implicit classes...
-    */
+    cupsdRemoveSelect(p->dnssd_ipp_fd);
+    DNSServiceRefDeallocate(p->dnssd_ipp_ref);
+    p->dnssd_ipp_ref = NULL;
+    p->dnssd_ipp_fd  = -1;
+  }
 
-    if (p->type & CUPS_PRINTER_IMPLICIT)
-    {
-      len = 0;
-      continue;
-    }
+  cupsdClearString(&p->reg_name);
 
+  if (p->txt_record)
+  {
    /*
-    * If len == 0, get the length of this printer name up to the "@"
-    * sign (if any).
+    * p->txt_record is malloc'd, not _cupsStrAlloc'd...
     */
 
-    cupsArraySave(Printers);
-
-    if (len > 0 &&
-       strncasecmp(p->name, name + offset, len) == 0 &&
-       (p->name[len] == '\0' || p->name[len] == '@'))
-    {
-     /*
-      * We have more than one printer with the same name; see if
-      * we have a class, and if this printer is a member...
-      */
+    free(p->txt_record);
+    p->txt_record = NULL;
+  }
+}
 
-      if (pclass && strcasecmp(pclass->name, name))
-      {
-       if (update)
-         cupsdSetPrinterAttrs(pclass);
 
-       update = 0;
-       pclass = NULL;
-      }
+/*
+ * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the
+ *                          TXT record format.
+ */
 
-      if (!pclass && (pclass = cupsdFindDest(name)) == NULL)
-      {
-       /*
-       * Need to add the class...
-       */
+static char *                          /* O - TXT record */
+dnssdPackTxtRecord(int  *txt_len,      /* O - TXT record length */
+                  char *keyvalue[][2], /* I - Table of key value pairs */
+                  int  count)          /* I - Items in table */
+{
+  int  i;                              /* Looping var */
+  int  length;                         /* Length of TXT record */
+  int  length2;                                /* Length of value */
+  char *txtRecord;                     /* TXT record buffer */
+  char *cursor;                                /* Looping pointer */
 
-       pclass = cupsdAddPrinter(name);
-       cupsArrayAdd(ImplicitPrinters, pclass);
 
-       pclass->type      |= CUPS_PRINTER_IMPLICIT;
-       pclass->accepting = 1;
-       pclass->state     = IPP_PRINTER_IDLE;
+ /*
+  * Calculate the buffer size
+  */
 
-        cupsdSetString(&pclass->location, p->location);
-        cupsdSetString(&pclass->info, p->info);
+  for (length = i = 0; i < count; i++)
+    length += 1 + strlen(keyvalue[i][0]) + 
+             (keyvalue[i][1] ? 1 + strlen(keyvalue[i][1]) : 0);
 
-        update = 1;
+ /*
+  * Allocate and fill it
+  */
 
-        cupsdLogMessage(CUPSD_LOG_INFO, "Added implicit class \"%s\"...",
-                       name);
-      }
+  txtRecord = malloc(length);
+  if (txtRecord)
+  {
+    *txt_len = length;
 
-      if (first != NULL)
-      {
-        for (i = 0; i < pclass->num_printers; i ++)
-         if (pclass->printers[i] == first)
-           break;
+    for (cursor = txtRecord, i = 0; i < count; i++)
+    {
+     /*
+      * Drop in the p-string style length byte followed by the data
+      */
 
-        if (i >= pclass->num_printers)
-       {
-         first->in_implicit_class = 1;
-         cupsdAddPrinterToClass(pclass, first);
-        }
+      length  = strlen(keyvalue[i][0]);
+      length2 = keyvalue[i][1] ? 1 + strlen(keyvalue[i][1]) : 0;
 
-       first = NULL;
-      }
+      *cursor++ = (unsigned char)(length + length2);
 
-      for (i = 0; i < pclass->num_printers; i ++)
-       if (pclass->printers[i] == p)
-         break;
+      memcpy(cursor, keyvalue[i][0], length);
+      cursor += length;
 
-      if (i >= pclass->num_printers)
+      if (length2)
       {
-       p->in_implicit_class = 1;
-       cupsdAddPrinterToClass(pclass, p);
-       update = 1;
+        length2 --;
+       *cursor++ = '=';
+       memcpy(cursor, keyvalue[i][1], length2);
+       cursor += length2;
       }
     }
-    else
-    {
-     /*
-      * First time around; just get name length and mark it as first
-      * in the list...
-      */
-
-      if ((hptr = strchr(p->name, '@')) != NULL)
-       len = hptr - p->name;
-      else
-       len = strlen(p->name);
-
-      strncpy(name, p->name, len);
-      name[len] = '\0';
-      offset    = 0;
+  }
 
-      if ((first = (hptr ? cupsdFindDest(name) : p)) != NULL &&
-         !(first->type & CUPS_PRINTER_IMPLICIT))
-      {
-       /*
-       * Can't use same name as a local printer; add "Any" to the
-       * front of the name, unless we have explicitly disabled
-       * the "ImplicitAnyClasses"...
-       */
+  return (txtRecord);
+}
 
-        if (ImplicitAnyClasses && len < (sizeof(name) - 4))
-       {
-        /*
-         * Add "Any" to the class name...
-         */
 
-          strcpy(name, "Any");
-          strncpy(name + 3, p->name, len);
-         name[len + 3] = '\0';
-         offset        = 3;
-       }
-       else
-       {
-        /*
-         * Don't create an implicit class if we have a local printer
-         * with the same name...
-         */
+/*
+ * 'dnssdRegisterCallback()' - DNSServiceRegister callback.
+ */
 
-         len = 0;
-          cupsArrayRestore(Printers);
-         continue;
-       }
-      }
+static void
+dnssdRegisterCallback(
+    DNSServiceRef      sdRef,          /* I - DNS Service reference */
+    DNSServiceFlags    flags,          /* I - Reserved for future use */
+    DNSServiceErrorType        errorCode,      /* I - Error code */
+    const char         *name,          /* I - Service name */
+    const char         *regtype,       /* I - Service type */
+    const char         *domain,        /* I - Domain. ".local" for now */
+    void               *context)       /* I - User-defined context */
+{
+  (void)context;
 
-      first = p;
-    }
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, 
+                 "dnssdRegisterCallback(%s, %s)", name, regtype);
 
-    cupsArrayRestore(Printers);
+  if (errorCode)
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR, 
+                   "DNSServiceRegister failed with error %d", (int)errorCode);
+    return;
   }
-
- /*
-  * Update the last printer class as needed...
-  */
-
-  if (pclass && update)
-    cupsdSetPrinterAttrs(pclass);
 }
 
 
 /*
- * 'cupsdSaveRemoteCache()' - Save the remote printer cache.
+ * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer
+ *                           or update the broadcast contents.
  */
 
-void
-cupsdSaveRemoteCache(void)
+static void 
+dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */
 {
-  int                  i;              /* Looping var */
-  cups_file_t          *fp;            /* printers.conf file */
-  char                 temp[1024];     /* Temporary string */
-  cupsd_printer_t      *printer;       /* Current printer class */
-  time_t               curtime;        /* Current time */
-  struct tm            *curdate;       /* Current date */
+  DNSServiceErrorType  se;             /* dnssd errors */
+  cupsd_listener_t     *lis;           /* Current listening socket */
+  char                 *txt_record,    /* TXT record buffer */
+                       *name;          /* Service name */
+  int                  txt_len,        /* TXT record length */
+                       port;           /* IPP port number */
+  char                 str_buffer[1024];
+                                       /* C-string buffer */
+  const char           *computerName;  /* Computer name c-string ptr */
+  const char           *regtype;       /* Registration type */
+#ifdef HAVE_COREFOUNDATION_H
+  CFStringRef          computerNameRef;/* Computer name CFString */
+  CFStringEncoding     nameEncoding;   /* Computer name encoding */
+  CFMutableStringRef   shortNameRef;   /* Mutable name string */
+  CFIndex              nameLength;     /* Name string length */
+#else
+  int                  nameLength;     /* Name string length */
+#endif /* HAVE_COREFOUNDATION_H */
 
 
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
+                  !p->dnssd_ipp_ref ? "new" : "update");
+
  /*
-  * Create the remote.cache file...
+  * If per-printer sharing was just disabled make sure we're not
+  * registered before returning.
   */
 
-  snprintf(temp, sizeof(temp), "%s/remote.cache", CacheDir);
-
-  if ((fp = cupsFileOpen(temp, "w")) == NULL)
+  if (!p->shared)
   {
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "Unable to save remote.cache - %s", strerror(errno));
+    dnssdDeregisterPrinter(p);
     return;
   }
-  else
-    cupsdLogMessage(CUPSD_LOG_INFO, "Saving remote.cache...");
 
  /*
-  * Restrict access to the file...
+  * Get the computer name as a c-string...
   */
 
-  fchown(cupsFileNumber(fp), getuid(), Group);
-  fchmod(cupsFileNumber(fp), ConfigFilePerm);
+#ifdef HAVE_COREFOUNDATION_H
+  computerName = NULL;
+  if ((computerNameRef = SCDynamicStoreCopyComputerName(NULL, &nameEncoding)))
+    if ((computerName = CFStringGetCStringPtr(computerNameRef,
+                                              kCFStringEncodingUTF8)) == NULL)
+      if (CFStringGetCString(computerNameRef, str_buffer, sizeof(str_buffer),
+                             kCFStringEncodingUTF8))
+       computerName = str_buffer;
+#else
+  computerName = ServerName;
+#endif /* HAVE_COREFOUNDATION_H */
 
  /*
-  * Write a small header to the file...
+  * The registered name takes the form of "<printer-info> @ <computer name>"...
   */
 
-  curtime = time(NULL);
-  curdate = localtime(&curtime);
-  strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
+  name = NULL;
+  if (computerName)
+    cupsdSetStringf(&name, "%s @ %s",
+                    (p->info && strlen(p->info)) ? p->info : p->name,
+                   computerName);
+  else
+    cupsdSetString(&name, (p->info && strlen(p->info)) ? p->info : p->name);
 
-  cupsFilePuts(fp, "# Remote cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+#ifdef HAVE_COREFOUNDATION_H
+  if (computerNameRef)
+    CFRelease(computerNameRef);
+#endif /* HAVE_COREFOUNDATION_H */
 
  /*
-  * Write each local printer known to the system...
+  * If an existing printer was renamed, unregister it and start over...
   */
 
-  for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
-       printer;
-       printer = (cupsd_printer_t *)cupsArrayNext(Printers))
-  {
-   /*
-    * Skip local destinations...
-    */
+  if (p->reg_name && strcmp(p->reg_name, name))
+    dnssdDeregisterPrinter(p);
 
-    if (!(printer->type & CUPS_PRINTER_REMOTE))
-      continue;
+  txt_len    = 0;                      /* anti-compiler-warning-code */
+  txt_record = dnssdBuildTxtRecord(&txt_len, p);
 
+  if (!p->dnssd_ipp_ref)
+  {
    /*
-    * Write printers as needed...
+    * Initial registration...
     */
 
-    if (printer == DefaultPrinter)
-      cupsFilePuts(fp, "<Default");
-    else
-      cupsFilePutChar(fp, '<');
+    cupsdSetString(&p->reg_name, name);
 
-    if (printer->type & CUPS_PRINTER_CLASS)
-      cupsFilePrintf(fp, "Class %s>\n", printer->name);
-    else
-      cupsFilePrintf(fp, "Printer %s>\n", printer->name);
+    port = ippPort();
 
-    cupsFilePrintf(fp, "Type %d\n", printer->type);
+    for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
+        lis;
+        lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
+    {
+      if (lis->address.addr.sa_family == AF_INET)
+      {
+       port = ntohs(lis->address.ipv4.sin_port);
+       break;
+      }
+      else if (lis->address.addr.sa_family == AF_INET6)
+      {
+       port = ntohs(lis->address.ipv6.sin6_port);
+       break;
+      }
+    }
 
-    cupsFilePrintf(fp, "BrowseTime %d\n", (int)printer->browse_time);
+   /*
+    * Use the _fax subtype for fax queues...
+    */
 
-    if (printer->info)
-      cupsFilePrintf(fp, "Info %s\n", printer->info);
+    regtype = (p->type & CUPS_PRINTER_FAX) ? dnssdIPPFaxRegType :
+                                             dnssdIPPRegType;
 
-    if (printer->make_model)
-      cupsFilePrintf(fp, "MakeModel %s\n", printer->make_model);
+    cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) type is \"%s\"",
+                    p->name, regtype);
 
-    if (printer->location)
-      cupsFilePrintf(fp, "Location %s\n", printer->location);
+    se = DNSServiceRegister(&p->dnssd_ipp_ref, 0, 0, name, regtype, 
+                           NULL, NULL, htons(port), txt_len, txt_record,
+                           dnssdRegisterCallback, p);
 
-    if (printer->device_uri)
-      cupsFilePrintf(fp, "DeviceURI %s\n", printer->device_uri);
+   /*
+    * In case the name is too long, try shortening the string one character
+    * at a time...
+    */
 
-    if (printer->state == IPP_PRINTER_STOPPED)
+    if (se == kDNSServiceErr_BadParam)
     {
-      cupsFilePuts(fp, "State Stopped\n");
-      cupsFilePrintf(fp, "StateMessage %s\n", printer->state_message);
-    }
-    else
-      cupsFilePuts(fp, "State Idle\n");
+#ifdef HAVE_COREFOUNDATION_H
+      if ((shortNameRef = CFStringCreateMutable(NULL, 0)) != NULL)
+      {
+       CFStringAppendCString(shortNameRef, name, kCFStringEncodingUTF8);
+        nameLength = CFStringGetLength(shortNameRef);
 
-    if (printer->accepting)
-      cupsFilePuts(fp, "Accepting Yes\n");
-    else
-      cupsFilePuts(fp, "Accepting No\n");
+       while (se == kDNSServiceErr_BadParam && nameLength > 1)
+       {
+         CFStringDelete(shortNameRef, CFRangeMake(--nameLength, 1));
+         if (CFStringGetCString(shortNameRef, str_buffer, sizeof(str_buffer),
+                                kCFStringEncodingUTF8))
+         {
+           se = DNSServiceRegister(&p->dnssd_ipp_ref, 0, 0, str_buffer,
+                                   regtype, NULL, NULL, htons(port),
+                                   txt_len, txt_record,
+                                   dnssdRegisterCallback, p);
+         }
+       }
 
-    cupsFilePrintf(fp, "JobSheets %s %s\n", printer->job_sheets[0],
-            printer->job_sheets[1]);
+       CFRelease(shortNameRef);
+      }
+#else
+      nameLength = strlen(name);
+      while (se == kDNSServiceErr_BadParam && nameLength > 1)
+      {
+       name[--nameLength] = '\0';
+       se = DNSServiceRegister(&p->dnssd_ipp_ref, 0, 0, str_buffer, regtype, 
+                               NULL, NULL, htons(port), txt_len, txt_record,
+                               dnssdRegisterCallback, p);
+      }
+#endif /* HAVE_COREFOUNDATION_H */
+    }
 
-    for (i = 0; i < printer->num_users; i ++)
-      cupsFilePrintf(fp, "%sUser %s\n", printer->deny_users ? "Deny" : "Allow",
-              printer->users[i]);
+    if (se == kDNSServiceErr_NoError)
+    {
+      p->dnssd_ipp_fd = DNSServiceRefSockFD(p->dnssd_ipp_ref);
+      p->txt_record   = txt_record;
+      p->txt_len      = txt_len;
+      txt_record      = NULL;
 
-    if (printer->type & CUPS_PRINTER_CLASS)
-      cupsFilePuts(fp, "</Class>\n");
+      cupsdAddSelect(p->dnssd_ipp_fd, (cupsd_selfunc_t)cupsdUpdateDNSSDBrowse,
+                     NULL, (void *)p);
+    }
     else
-      cupsFilePuts(fp, "</Printer>\n");
+      cupsdLogMessage(CUPSD_LOG_WARN,
+                      "DNS-SD registration of \"%s\" failed with %d",
+                     p->name, se);
   }
+  else if (txt_len != p->txt_len || memcmp(txt_record, p->txt_record, txt_len))
+  {
+   /*
+    * Update the existing registration...
+    */
 
-  cupsFileClose(fp);
-}
-
-
-/*
- * 'cupsdSendBrowseDelete()' - Send a "browse delete" message for a printer.
- */
-
-void
-cupsdSendBrowseDelete(
-    cupsd_printer_t *p)                        /* I - Printer to delete */
-{
- /*
-  * Only announce if browsing is enabled...
-  */
-
-  if (!Browsing || !p->shared)
-    return;
+    /* A TTL of 0 means use record's original value (Radar 3176248) */
+    se = DNSServiceUpdateRecord(p->dnssd_ipp_ref, NULL, 0,
+                               txt_len, txt_record, 0);
 
- /*
-  * First mark the printer for deletion...
-  */
+    if (p->txt_record)
+      free(p->txt_record);
 
-  p->type |= CUPS_PRINTER_DELETE;
+    p->txt_record = txt_record;
+    p->txt_len    = txt_len;
+    txt_record    = NULL;
+  }
 
- /*
-  * Announce the deletion...
-  */
+  if (txt_record)
+    free(txt_record);
 
-  if (BrowseLocalProtocols & BROWSE_CUPS)
-    cupsdSendCUPSBrowse(p);
-#ifdef HAVE_LIBSLP
-  if (BrowseLocalProtocols & BROWSE_SLP)
-    slp_dereg_printer(p);
-#endif /* HAVE_LIBSLP */
+  cupsdClearString(&name);
 }
+#endif /* HAVE_DNSSD */
 
 
 /*
- * 'cupsdSendBrowseList()' - Send new browsing information as necessary.
+ * 'process_implicit_classes()' - Create/update implicit classes as needed.
  */
 
-void
-cupsdSendBrowseList(void)
+static void
+process_implicit_classes(
+    int *write_printcap)               /* O - Write printcap file? */
 {
-  int                  count;          /* Number of dests to update */
-  cupsd_printer_t      *p;             /* Current printer */
-  time_t               ut,             /* Minimum update time */
-                       to;             /* Timeout time */
+  int          i;                      /* Looping var */
+  int          update;                 /* Update printer attributes? */
+  char         name[IPP_MAX_NAME],     /* Name of printer */
+               *hptr;                  /* Pointer into hostname */
+  cupsd_printer_t *p,                  /* Printer information */
+               *pclass,                /* Printer class */
+               *first;                 /* First printer in class */
+  int          offset,                 /* Offset of name */
+               len;                    /* Length of name */
 
 
-  if (!Browsing || !BrowseLocalProtocols || !Printers)
+  if (!ImplicitClasses || !Printers)
     return;
 
  /*
-  * Compute the update and timeout times...
-  */
-
-  ut = time(NULL) - BrowseInterval;
-  to = time(NULL) - BrowseTimeout;
-
- /*
-  * Figure out how many printers need an update...
+  * Loop through all available printers and create classes as needed...
   */
 
-  if (BrowseInterval > 0)
+  for (p = (cupsd_printer_t *)cupsArrayFirst(Printers), len = 0, offset = 0,
+           update = 0, pclass = NULL, first = NULL;
+       p != NULL;
+       p = (cupsd_printer_t *)cupsArrayNext(Printers))
   {
-    int        max_count;                      /* Maximum number to update */
-
-
    /*
-    * Throttle the number of printers we'll be updating this time
-    * around based on the number of queues that need updating and
-    * the maximum number of queues to update each second...
+    * Skip implicit classes...
     */
 
-    max_count = 2 * cupsArrayCount(Printers) / BrowseInterval + 1;
-
-    for (count = 0, p = (cupsd_printer_t *)cupsArrayFirst(Printers);
-         count < max_count && p != NULL;
-        p = (cupsd_printer_t *)cupsArrayNext(Printers))
-      if (!(p->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) &&
-          p->shared && p->browse_time < ut)
-        count ++;
+    if (p->type & CUPS_PRINTER_IMPLICIT)
+    {
+      len = 0;
+      continue;
+    }
 
    /*
-    * Loop through all of the printers and send local updates as needed...
+    * If len == 0, get the length of this printer name up to the "@"
+    * sign (if any).
     */
 
-    if (BrowseNext)
-      p = (cupsd_printer_t *)cupsArrayFind(Printers, BrowseNext);
-    else
-      p = (cupsd_printer_t *)cupsArrayFirst(Printers);
+    cupsArraySave(Printers);
 
-    for (;
-         count > 0;
-        p = (cupsd_printer_t *)cupsArrayNext(Printers))
+    if (len > 0 &&
+       !strncasecmp(p->name, name + offset, len) &&
+       (p->name[len] == '\0' || p->name[len] == '@'))
     {
      /*
-      * Check for wraparound...
+      * We have more than one printer with the same name; see if
+      * we have a class, and if this printer is a member...
       */
 
-      if (!p)
-        p = (cupsd_printer_t *)cupsArrayFirst(Printers);
+      if (pclass && strcasecmp(pclass->name, name))
+      {
+       if (update)
+         cupsdSetPrinterAttrs(pclass);
 
-      if (!p)
-        break;
-      else if ((p->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) ||
-               !p->shared)
-        continue;
-      else if (p->browse_time < ut)
+       update = 0;
+       pclass = NULL;
+      }
+
+      if (!pclass && (pclass = cupsdFindDest(name)) == NULL)
       {
        /*
-       * Need to send an update...
+       * Need to add the class...
        */
 
-       count --;
+       pclass = cupsdAddPrinter(name);
+       cupsArrayAdd(ImplicitPrinters, pclass);
 
-       p->browse_time = time(NULL);
+       pclass->type      |= CUPS_PRINTER_IMPLICIT;
+       pclass->accepting = 1;
+       pclass->state     = IPP_PRINTER_IDLE;
 
-       if (BrowseLocalProtocols & BROWSE_CUPS)
-          cupsdSendCUPSBrowse(p);
+        cupsdSetString(&pclass->location, p->location);
+        cupsdSetString(&pclass->info, p->info);
 
-#ifdef HAVE_LIBSLP
-       if (BrowseLocalProtocols & BROWSE_SLP)
-          cupsdSendSLPBrowse(p);
-#endif /* HAVE_LIBSLP */
+        cupsdSetString(&pclass->job_sheets[0], p->job_sheets[0]);
+        cupsdSetString(&pclass->job_sheets[1], p->job_sheets[1]);
+
+        update = 1;
+
+       if (write_printcap)
+         *write_printcap = 1;
+
+        cupsdLogMessage(CUPSD_LOG_DEBUG, "Added implicit class \"%s\"...",
+                       name);
+       cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED, p, NULL,
+                      "Implicit class \'%s\' added by directory services.",
+                     name);
       }
-    }
 
-   /*
-    * Save where we left off so that all printers get updated...
-    */
+      if (first != NULL)
+      {
+        for (i = 0; i < pclass->num_printers; i ++)
+         if (pclass->printers[i] == first)
+           break;
 
-    BrowseNext = p;
-  }
+        if (i >= pclass->num_printers)
+       {
+         first->in_implicit_class = 1;
+         cupsdAddPrinterToClass(pclass, first);
+        }
 
- /*
-  * Loop through all of the printers and send local updates as needed...
-  */
+       first = NULL;
+      }
 
-  for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
-       p;
-       p = (cupsd_printer_t *)cupsArrayNext(Printers))
-  {
-   /*
-    * If this is a remote queue, see if it needs to be timed out...
-    */
+      for (i = 0; i < pclass->num_printers; i ++)
+       if (pclass->printers[i] == p)
+         break;
 
-    if (p->type & CUPS_PRINTER_REMOTE)
+      if (i >= pclass->num_printers)
+      {
+       p->in_implicit_class = 1;
+       cupsdAddPrinterToClass(pclass, p);
+       update = 1;
+      }
+    }
+    else
     {
-      if (p->browse_time < to)
+     /*
+      * First time around; just get name length and mark it as first
+      * in the list...
+      */
+
+      if ((hptr = strchr(p->name, '@')) != NULL)
+       len = hptr - p->name;
+      else
+       len = strlen(p->name);
+
+      strncpy(name, p->name, len);
+      name[len] = '\0';
+      offset    = 0;
+
+      if ((first = (hptr ? cupsdFindDest(name) : p)) != NULL &&
+         !(first->type & CUPS_PRINTER_IMPLICIT))
       {
-       cupsdAddEvent(CUPSD_EVENT_PRINTER_DELETED, p, NULL,
-                      "%s \'%s\' deleted by directory services (timeout).",
-                     (p->type & CUPS_PRINTER_CLASS) ? "Class" : "Printer",
-                     p->name);
+       /*
+       * Can't use same name as a local printer; add "Any" to the
+       * front of the name, unless we have explicitly disabled
+       * the "ImplicitAnyClasses"...
+       */
 
-        cupsdLogMessage(CUPSD_LOG_INFO,
-                       "Remote destination \"%s\" has timed out; deleting it...",
-                       p->name);
+        if (ImplicitAnyClasses && len < (sizeof(name) - 4))
+       {
+        /*
+         * Add "Any" to the class name...
+         */
 
-        cupsArraySave(Printers);
-        cupsdDeletePrinter(p, 1);
-        cupsArrayRestore(Printers);
+          strcpy(name, "Any");
+          strncpy(name + 3, p->name, len);
+         name[len + 3] = '\0';
+         offset        = 3;
+       }
+       else
+       {
+        /*
+         * Don't create an implicit class if we have a local printer
+         * with the same name...
+         */
+
+         len = 0;
+          cupsArrayRestore(Printers);
+         continue;
+       }
       }
+
+      first = p;
     }
+
+    cupsArrayRestore(Printers);
   }
+
+ /*
+  * Update the last printer class as needed...
+  */
+
+  if (pclass && update)
+    cupsdSetPrinterAttrs(pclass);
 }
 
 
 /*
- * 'cupsdSendCUPSBrowse()' - Send new browsing information using the CUPS protocol.
+ * 'send_cups_browse()' - Send new browsing information using the CUPS
+ *                        protocol.
  */
 
-void
-cupsdSendCUPSBrowse(cupsd_printer_t *p)        /* I - Printer to send */
+static void
+send_cups_browse(cupsd_printer_t *p)   /* I - Printer to send */
 {
   int                  i;              /* Looping var */
   cups_ptype_t         type;           /* Printer type */
   cupsd_dirsvc_addr_t  *b;             /* Browse address */
   int                  bytes;          /* Length of packet */
-  char                 packet[1453];   /* Browse data packet */
-  char                 uri[1024];      /* Printer URI */
-  char                 options[1024];  /* Browse local options */
+  char                 packet[1453],   /* Browse data packet */
+                       uri[1024],      /* Printer URI */
+                       location[1024], /* printer-location */
+                       info[1024],     /* printer-info */
+                       make_model[1024];
+                                       /* printer-make-and-model */
   cupsd_netif_t                *iface;         /* Network interface */
 
 
@@ -1363,14 +2882,30 @@ cupsdSendCUPSBrowse(cupsd_printer_t *p) /* I - Printer to send */
   if (!p->accepting)
     type |= CUPS_PRINTER_REJECTING;
 
+  if (p == DefaultPrinter)
+    type |= CUPS_PRINTER_DEFAULT;
+
  /*
-  * Initialize the browse options...
+  * Remove quotes from printer-info, printer-location, and
+  * printer-make-and-model attributes...
   */
 
-  if (BrowseLocalOptions)
-    snprintf(options, sizeof(options), " ipp-options=%s", BrowseLocalOptions);
+  dequote(location, p->location, sizeof(location));
+  dequote(info, p->info, sizeof(info));
+
+  if (p->make_model)
+    dequote(make_model, p->make_model, sizeof(make_model));
+  else if (p->type & CUPS_PRINTER_CLASS)
+  {
+    if (p->num_printers > 0 && p->printers[0]->make_model)
+      strlcpy(make_model, p->printers[0]->make_model, sizeof(make_model));
+    else
+      strlcpy(make_model, "Local Printer Class", sizeof(make_model));
+  }
+  else if (p->raw)
+    strlcpy(make_model, "Local Raw Printer", sizeof(make_model));
   else
-    options[0] = '\0';
+    strlcpy(make_model, "Local System V Printer", sizeof(make_model));
 
  /*
   * Send a packet to each browse address...
@@ -1383,7 +2918,7 @@ cupsdSendCUPSBrowse(cupsd_printer_t *p)   /* I - Printer to send */
       * Send the browse packet to one or more interfaces...
       */
 
-      if (strcmp(b->iface, "*") == 0)
+      if (!strcmp(b->iface, "*"))
       {
        /*
         * Send to all local interfaces...
@@ -1391,7 +2926,9 @@ cupsdSendCUPSBrowse(cupsd_printer_t *p)   /* I - Printer to send */
 
         cupsdNetIFUpdate();
 
-        for (iface = NetIFList; iface != NULL; iface = iface->next)
+       for (iface = (cupsd_netif_t *)cupsArrayFirst(NetIFList);
+            iface;
+            iface = (cupsd_netif_t *)cupsArrayNext(NetIFList))
        {
         /*
          * Only send to local, IPv4 interfaces...
@@ -1403,13 +2940,12 @@ cupsdSendCUPSBrowse(cupsd_printer_t *p) /* I - Printer to send */
 
          httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
                           iface->hostname, iface->port,
-                          (p->type & CUPS_PRINTER_CLASS) ? "/classes/%s%s" :
+                          (p->type & CUPS_PRINTER_CLASS) ? "/classes/%s" :
                                                            "/printers/%s",
                           p->name);
-         snprintf(packet, sizeof(packet), "%x %x %s \"%s\" \"%s\" \"%s\"%s\n",
-                  type, p->state, uri, p->location ? p->location : "",
-                  p->info ? p->info : "",
-                  p->make_model ? p->make_model : "Unknown", options);
+         snprintf(packet, sizeof(packet), "%x %x %s \"%s\" \"%s\" \"%s\" %s\n",
+                  type, p->state, uri, location, info, make_model,
+                  p->browse_attrs ? p->browse_attrs : "");
 
          bytes = strlen(packet);
 
@@ -1421,7 +2957,7 @@ cupsdSendCUPSBrowse(cupsd_printer_t *p)   /* I - Printer to send */
 
          sendto(BrowseSocket, packet, bytes, 0,
                 (struct sockaddr *)&(iface->broadcast),
-                sizeof(struct sockaddr_in));
+                httpAddrLength(&(iface->broadcast)));
         }
       }
       else if ((iface = cupsdNetIFFind(b->iface)) != NULL)
@@ -1431,7 +2967,7 @@ cupsdSendCUPSBrowse(cupsd_printer_t *p)   /* I - Printer to send */
        */
 
         while (iface)
-         if (strcasecmp(b->iface, iface->name))
+         if (strcmp(b->iface, iface->name))
          {
            iface = NULL;
            break;
@@ -1439,19 +2975,18 @@ cupsdSendCUPSBrowse(cupsd_printer_t *p) /* I - Printer to send */
          else if (iface->address.addr.sa_family == AF_INET && iface->port)
            break;
          else
-           iface = iface->next;
+            iface = (cupsd_netif_t *)cupsArrayNext(NetIFList);
 
         if (iface)
        {
          httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
                           iface->hostname, iface->port,
-                          (p->type & CUPS_PRINTER_CLASS) ? "/classes/%s%s" :
+                          (p->type & CUPS_PRINTER_CLASS) ? "/classes/%s" :
                                                            "/printers/%s",
                           p->name);
-         snprintf(packet, sizeof(packet), "%x %x %s \"%s\" \"%s\" \"%s\"%s\n",
-                  type, p->state, uri, p->location ? p->location : "",
-                  p->info ? p->info : "",
-                  p->make_model ? p->make_model : "Unknown", options);
+         snprintf(packet, sizeof(packet), "%x %x %s \"%s\" \"%s\" \"%s\" %s\n",
+                  type, p->state, uri, location, info, make_model,
+                  p->browse_attrs ? p->browse_attrs : "");
 
          bytes = strlen(packet);
 
@@ -1463,7 +2998,7 @@ cupsdSendCUPSBrowse(cupsd_printer_t *p)   /* I - Printer to send */
 
          sendto(BrowseSocket, packet, bytes, 0,
                 (struct sockaddr *)&(iface->broadcast),
-                sizeof(struct sockaddr_in));
+                httpAddrLength(&(iface->broadcast)));
         }
       }
     }
@@ -1474,11 +3009,9 @@ cupsdSendCUPSBrowse(cupsd_printer_t *p)  /* I - Printer to send */
       * the default server name...
       */
 
-      snprintf(packet, sizeof(packet), "%x %x %s \"%s\" \"%s\" \"%s\"%s\n",
-                      type, p->state, p->uri,
-              p->location ? p->location : "",
-              p->info ? p->info : "",
-              p->make_model ? p->make_model : "Unknown", options);
+      snprintf(packet, sizeof(packet), "%x %x %s \"%s\" \"%s\" \"%s\" %s\n",
+                      type, p->state, p->uri, location, info, make_model,
+              p->browse_attrs ? p->browse_attrs : "");
 
       bytes = strlen(packet);
       cupsdLogMessage(CUPSD_LOG_DEBUG2,
@@ -1486,7 +3019,7 @@ cupsdSendCUPSBrowse(cupsd_printer_t *p)   /* I - Printer to send */
 
       if (sendto(BrowseSocket, packet, bytes, 0,
                 (struct sockaddr *)&(b->to),
-                sizeof(struct sockaddr_in)) <= 0)
+                httpAddrLength(&(b->to))) <= 0)
       {
        /*
         * Unable to send browse packet, so remove this address from the
@@ -1494,11 +3027,12 @@ cupsdSendCUPSBrowse(cupsd_printer_t *p) /* I - Printer to send */
        */
 
        cupsdLogMessage(CUPSD_LOG_ERROR,
-                       "cupsdSendBrowseList: sendto failed for browser %d - %s.",
-                       b - Browsers + 1, strerror(errno));
+                       "cupsdSendBrowseList: sendto failed for browser "
+                       "%d - %s.",
+                       (int)(b - Browsers + 1), strerror(errno));
 
         if (i > 1)
-         memcpy(b, b + 1, (i - 1) * sizeof(cupsd_dirsvc_addr_t));
+         memmove(b, b + 1, (i - 1) * sizeof(cupsd_dirsvc_addr_t));
 
        b --;
        NumBrowsers --;
@@ -1507,13 +3041,138 @@ cupsdSendCUPSBrowse(cupsd_printer_t *p)        /* I - Printer to send */
 }
 
 
+#ifdef HAVE_OPENLDAP
+/*
+ * 'send_ldap_browse()' - Send LDAP printer registrations.
+ */
+
+static void
+send_ldap_browse(cupsd_printer_t *p)   /* I - Printer to register */
+{
+  int          i;                      /* Looping var... */
+  LDAPMod      mods[7];                /* The 7 attributes we will be adding */
+  LDAPMod      *pmods[8];              /* Pointers to the 7 attributes + NULL */
+  LDAPMessage  *res;                   /* Search result token */
+  char         *cn_value[2],           /* Change records */
+               *uri[2],
+               *info[2],
+               *location[2],
+               *make_model[2],
+               *type[2],
+               typestring[255],        /* String to hold printer-type */
+               filter[256],            /* Search filter for possible UPDATEs */
+               dn[1024];               /* DN of the printer we are adding */
+  int          rc;                     /* LDAP status */
+  static const char * const objectClass_values[] =
+               {                       /* The 3 objectClass's we use in */
+                 "top",                /* our LDAP entries              */
+                 "device",
+                 "cupsPrinter",
+                 NULL
+               };
+
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "send_ldap_browse: %s\n", p->name);
+
+ /*
+  * Everything in ldap is ** so we fudge around it...
+  */
+
+  sprintf(typestring, "%u", p->type);
+
+  cn_value[0]   = p->name;
+  cn_value[1]   = NULL;
+  info[0]       = p->info ? p->info : "Unknown";
+  info[1]       = NULL;
+  location[0]   = p->location ? p->location : "Unknown";
+  location[1]   = NULL;
+  make_model[0] = p->make_model ? p->make_model : "Unknown";
+  make_model[1] = NULL;
+  type[0]       = typestring;
+  type[1]       = NULL;
+  uri[0]        = p->uri;
+  uri[1]        = NULL;
+
+  snprintf(filter, sizeof(filter),
+           "(&(objectclass=cupsPrinter)(printerURI=%s))", p->uri);
+
+  ldap_search_s(BrowseLDAPHandle, BrowseLDAPDN, LDAP_SCOPE_SUBTREE,
+                filter, (char **)ldap_attrs, 0, &res);
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "send_ldap_browse: Searching \"%s\"",
+                  filter);
+
+  mods[0].mod_type = "cn";
+  mods[0].mod_values = cn_value;
+  mods[1].mod_type = "printerDescription";
+  mods[1].mod_values = info;
+  mods[2].mod_type = "printerURI";
+  mods[2].mod_values = uri;
+  mods[3].mod_type = "printerLocation";
+  mods[3].mod_values = location;
+  mods[4].mod_type = "printerMakeAndModel";
+  mods[4].mod_values = make_model;
+  mods[5].mod_type = "printerType";
+  mods[5].mod_values = type;
+  mods[6].mod_type = "objectClass";
+  mods[6].mod_values = (char **)objectClass_values;
+
+  snprintf(dn, sizeof(dn), "cn=%s,ou=printers,%s", p->name, BrowseLDAPDN);
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "send_ldap_browse: dn=\"%s\"", dn);
+
+  if (ldap_count_entries(BrowseLDAPHandle, res) > 0)
+  {
+   /*
+    * Printer has already been registered, modify the current
+    * registration...
+    */
+
+    cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                    "send_ldap_browse: Replacing entry...");
+
+    for (i = 0; i < 7; i ++)
+    {
+      pmods[i]         = mods + i;
+      pmods[i]->mod_op = LDAP_MOD_REPLACE;
+    }
+    pmods[i] = NULL;
+
+    if ((rc = ldap_modify_s(BrowseLDAPHandle, dn, pmods)) != LDAP_SUCCESS)
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "LDAP modify for %s failed with status %d: %s",
+                      p->name, rc, ldap_err2string(rc));
+  }
+  else 
+  {
+   /*
+    * Printer has never been registered, add the current
+    * registration...
+    */
+
+    cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                    "send_ldap_browse: Adding entry...");
+
+    for (i = 0; i < 7; i ++)
+    {
+      pmods[i]         = mods + i;
+      pmods[i]->mod_op = LDAP_MOD_ADD;
+    }
+    pmods[i] = NULL;
+
+    if ((rc = ldap_add_s(BrowseLDAPHandle, dn, pmods)) != LDAP_SUCCESS)
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "LDAP add for %s failed with status %d: %s",
+                      p->name, rc, ldap_err2string(rc));
+  }
+}
+#endif /* HAVE_OPENLDAP */
+
+
 #ifdef HAVE_LIBSLP
 /*
- * 'cupsdSendSLPBrowse()' - Register the specified printer with SLP.
+ * 'send_slp_browse()' - Register the specified printer with SLP.
  */
 
-void 
-cupsdSendSLPBrowse(cupsd_printer_t *p) /* I - Printer to register */
+static void
+send_slp_browse(cupsd_printer_t *p)    /* I - Printer to register */
 {
   char         srvurl[HTTP_MAX_URI],   /* Printer service URI */
                attrs[8192],            /* Printer attributes */
@@ -1529,7 +3188,7 @@ cupsdSendSLPBrowse(cupsd_printer_t *p)    /* I - Printer to register */
   SLPError     error;                  /* SLP error, if any */
 
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdSendSLPBrowse(%p = \"%s\")", p,
+  cupsdLogMessage(CUPSD_LOG_DEBUG, "send_slp_browse(%p = \"%s\")", p,
                   p->name);
 
  /*
@@ -1656,6 +3315,7 @@ cupsdSendSLPBrowse(cupsd_printer_t *p)    /* I - Printer to register */
            "(printer-info=%s),"
            "(printer-more-info=%s),"
            "(printer-make-and-model=%s),"
+          "(printer-type=%d),"
           "(charset-supported=utf-8),"
           "(natural-language-configured=%s),"
           "(natural-language-supported=de,en,es,fr,it),"
@@ -1665,7 +3325,7 @@ cupsdSendSLPBrowse(cupsd_printer_t *p)    /* I - Printer to register */
           "(multiple-document-jobs-supported=true)"
           "(ipp-versions-supported=1.0,1.1)",
           p->uri, authentication->values[0].string.text, p->name, location,
-          info, p->uri, make_model, DefaultLanguage,
+          info, p->uri, make_model, p->type, DefaultLanguage,
            p->type & CUPS_PRINTER_COLOR ? "true" : "false",
            finishings,
            p->type & CUPS_PRINTER_DUPLEX ?
@@ -1684,320 +3344,216 @@ cupsdSendSLPBrowse(cupsd_printer_t *p)        /* I - Printer to register */
     cupsdLogMessage(CUPSD_LOG_ERROR, "SLPReg of \"%s\" failed with status %d!", p->name,
                     error);
 }
-#endif /* HAVE_LIBSLP */
 
 
 /*
- * 'cupsdStartBrowsing()' - Start sending and receiving broadcast information.
+ * 'slp_attr_callback()' - SLP attribute callback 
  */
 
-void
-cupsdStartBrowsing(void)
+static SLPBoolean                      /* O - SLP_TRUE for success */
+slp_attr_callback(
+    SLPHandle  hslp,                   /* I - SLP handle */
+    const char *attrlist,              /* I - Attribute list */
+    SLPError   errcode,                        /* I - Parsing status for this attr */
+    void       *cookie)                        /* I - Current printer */
 {
-  int                  val;            /* Socket option value */
-  struct sockaddr_in   addr;           /* Broadcast address */
+  char                 *tmp = 0;       /* Temporary string */
+  cupsd_printer_t      *p = (cupsd_printer_t*)cookie;
+                                       /* Current printer */
 
 
-  BrowseNext = NULL;
+  (void)hslp;                          /* anti-compiler-warning-code */
 
-  if (!Browsing || !(BrowseLocalProtocols | BrowseRemoteProtocols))
-    return;
+ /*
+  * Bail if there was an error
+  */
 
-  if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_CUPS)
-  {
-    if (BrowseSocket < 0)
-    {
-     /*
-      * Create the broadcast socket...
-      */
+  if (errcode != SLP_OK)
+    return (SLP_TRUE);
 
-      if ((BrowseSocket = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
-      {
-       cupsdLogMessage(CUPSD_LOG_ERROR,
-                       "cupsdStartBrowsing: Unable to create broadcast "
-                       "socket - %s.", strerror(errno));
-       BrowseLocalProtocols &= ~BROWSE_CUPS;
-       BrowseRemoteProtocols &= ~BROWSE_CUPS;
-       return;
-      }
+ /*
+  * Parse the attrlist to obtain things needed to build CUPS browse packet
+  */
 
-     /*
-      * Bind the socket to browse port...
-      */
+  memset(p, 0, sizeof(cupsd_printer_t));
 
-      memset(&addr, 0, sizeof(addr));
-      addr.sin_addr.s_addr = htonl(INADDR_ANY);
-      addr.sin_family      = AF_INET;
-      addr.sin_port        = htons(BrowsePort);
+  if (slp_get_attr(attrlist, "(printer-location=", &(p->location)))
+    return (SLP_FALSE);
+  if (slp_get_attr(attrlist, "(printer-info=", &(p->info)))
+    return (SLP_FALSE);
+  if (slp_get_attr(attrlist, "(printer-make-and-model=", &(p->make_model)))
+    return (SLP_FALSE);
+  if (!slp_get_attr(attrlist, "(printer-type=", &tmp))
+    p->type = atoi(tmp);
+  else
+    p->type = CUPS_PRINTER_REMOTE;
 
-      if (bind(BrowseSocket, (struct sockaddr *)&addr, sizeof(addr)))
-      {
-       cupsdLogMessage(CUPSD_LOG_ERROR,
-                       "cupsdStartBrowsing: Unable to bind broadcast "
-                       "socket - %s.", strerror(errno));
+  cupsdClearString(&tmp);
 
-#ifdef WIN32
-       closesocket(BrowseSocket);
-#else
-       close(BrowseSocket);
-#endif /* WIN32 */
+  return (SLP_TRUE);
+}
 
-       BrowseSocket = -1;
-       BrowseLocalProtocols &= ~BROWSE_CUPS;
-       BrowseRemoteProtocols &= ~BROWSE_CUPS;
-       return;
-      }
-    }
 
-   /*
-    * Set the "broadcast" flag...
   */
+/*
+ * 'slp_dereg_printer()' - SLPDereg() the specified printer
+ */
 
-    val = 1;
-    if (setsockopt(BrowseSocket, SOL_SOCKET, SO_BROADCAST, &val, sizeof(val)))
-    {
-      cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "cupsdStartBrowsing: Unable to set broadcast mode - %s.",
-                     strerror(errno));
+static void 
+slp_dereg_printer(cupsd_printer_t *p)  /* I - Printer */
+{
+  char srvurl[HTTP_MAX_URI];           /* Printer service URI */
 
-#ifdef WIN32
-      closesocket(BrowseSocket);
-#else
-      close(BrowseSocket);
-#endif /* WIN32 */
 
-      BrowseSocket = -1;
-      BrowseLocalProtocols &= ~BROWSE_CUPS;
-      BrowseRemoteProtocols &= ~BROWSE_CUPS;
-      return;
-    }
+  cupsdLogMessage(CUPSD_LOG_DEBUG, "slp_dereg_printer: printer=\"%s\"", p->name);
 
+  if (!(p->type & CUPS_PRINTER_REMOTE))
+  {
    /*
-    * Close the socket on exec...
+    * Make the SLP service URL that conforms to the IANA 
+    * 'printer:' template.
     */
 
-    fcntl(BrowseSocket, F_SETFD, fcntl(BrowseSocket, F_GETFD) | FD_CLOEXEC);
+    snprintf(srvurl, sizeof(srvurl), SLP_CUPS_SRVTYPE ":%s", p->uri);
 
    /*
-    * Finally, add the socket to the input selection set...
-    */
-
-    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                    "cupsdStartBrowsing: Adding fd %d to InputSet...",
-                    BrowseSocket);
-
-    FD_SET(BrowseSocket, InputSet);
-  }
-  else
-    BrowseSocket = -1;
-
-#ifdef HAVE_LIBSLP
-  if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP)
-  {
-   /* 
-    * Open SLP handle...
+    * Deregister the printer...
     */
 
-    if (SLPOpen("en", SLP_FALSE, &BrowseSLPHandle) != SLP_OK)
-    {
-      cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "Unable to open an SLP handle; disabling SLP browsing!");
-      BrowseLocalProtocols &= ~BROWSE_SLP;
-      BrowseRemoteProtocols &= ~BROWSE_SLP;
-    }
-
-    BrowseSLPRefresh = 0;
+    SLPDereg(BrowseSLPHandle, srvurl, slp_reg_callback, 0);
   }
-#endif /* HAVE_LIBSLP */
 }
 
 
 /*
- * 'cupsdStartPolling()' - Start polling servers as needed.
+ * 'slp_get_attr()' - Get an attribute from an SLP registration.
  */
 
-void
-cupsdStartPolling(void)
+static int                             /* O - 0 on success */
+slp_get_attr(const char *attrlist,     /* I - Attribute list string */
+             const char *tag,          /* I - Name of attribute */
+             char       **valbuf)      /* O - Value */
 {
-  int                  i;              /* Looping var */
-  cupsd_dirsvc_poll_t  *pollp;         /* Current polling server */
-  char                 polld[1024];    /* Poll daemon path */
-  char                 sport[10];      /* Server port */
-  char                 bport[10];      /* Browser port */
-  char                 interval[10];   /* Poll interval */
-  int                  statusfds[2];   /* Status pipe */
-  char                 *argv[6];       /* Arguments */
-  char                 *envp[100];     /* Environment */
-
-
- /*
-  * Don't do anything if we aren't polling...
-  */
-
-  if (NumPolled == 0)
-  {
-    PollPipe         = -1;
-    PollStatusBuffer = NULL;
-    return;
-  }
-
- /*
-  * Setup string arguments for polld, port and interval options.
-  */
-
-  snprintf(polld, sizeof(polld), "%s/daemon/cups-polld", ServerBin);
-
-  sprintf(bport, "%d", BrowsePort);
-
-  if (BrowseInterval)
-    sprintf(interval, "%d", BrowseInterval);
-  else
-    strcpy(interval, "30");
-
-  argv[0] = "cups-polld";
-  argv[2] = sport;
-  argv[3] = interval;
-  argv[4] = bport;
-  argv[5] = NULL;
+  char *ptr1,                          /* Pointer into string */
+       *ptr2;                          /* ... */
 
-  cupsdLoadEnv(envp, (int)(sizeof(envp) / sizeof(envp[0])));
 
- /*
-  * Create a pipe that receives the status messages from each
-  * polling daemon...
-  */
+  cupsdClearString(valbuf);
 
-  if (cupsdOpenPipe(statusfds))
+  if ((ptr1 = strstr(attrlist, tag)) != NULL)
   {
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "Unable to create polling status pipes - %s.",
-                   strerror(errno));
-    PollPipe         = -1;
-    PollStatusBuffer = NULL;
-    return;
-  }
+    ptr1 += strlen(tag);
 
-  PollPipe         = statusfds[0];
-  PollStatusBuffer = cupsdStatBufNew(PollPipe, "[Poll]");
+    if ((ptr2 = strchr(ptr1,')')) != NULL)
+    {
+     /*
+      * Copy the value...
+      */
 
- /*
-  * Run each polling daemon, redirecting stderr to the polling pipe...
-  */
+      *valbuf = calloc(ptr2 - ptr1 + 1, 1);
+      strncpy(*valbuf, ptr1, ptr2 - ptr1);
 
-  for (i = 0, pollp = Polled; i < NumPolled; i ++, pollp ++)
-  {
-    sprintf(sport, "%d", pollp->port);
+     /*
+      * Dequote the value...
+      */
 
-    argv[1] = pollp->hostname;
+      for (ptr1 = *valbuf; *ptr1; ptr1 ++)
+       if (*ptr1 == '\\' && ptr1[1])
+         _cups_strcpy(ptr1, ptr1 + 1);
 
-    if (cupsdStartProcess(polld, argv, envp, -1, -1, statusfds[1], -1,
-                          0, &(pollp->pid)) < 0)
-    {
-      cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "cupsdStartPolling: Unable to fork polling daemon - %s",
-                      strerror(errno));
-      pollp->pid = 0;
-      break;
+      return (0);
     }
-    else
-      cupsdLogMessage(CUPSD_LOG_DEBUG,
-                      "cupsdStartPolling: Started polling daemon for %s:%d, pid = %d",
-                      pollp->hostname, pollp->port, pollp->pid);
   }
 
-  close(statusfds[1]);
+  return (-1);
+}
 
- /*
-  * Finally, add the pipe to the input selection set...
-  */
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdStartPolling: Adding fd %d to InputSet...", PollPipe);
+/*
+ * 'slp_reg_callback()' - Empty SLPRegReport.
+ */
+
+static void
+slp_reg_callback(SLPHandle hslp,       /* I - SLP handle */
+                 SLPError  errcode,    /* I - Error code, if any */
+                void      *cookie)     /* I - App data */
+{
+  (void)hslp;
+  (void)errcode;
+  (void)cookie;
 
-  FD_SET(PollPipe, InputSet);
+  return;
 }
 
 
 /*
- * 'cupsdStopBrowsing()' - Stop sending and receiving broadcast information.
+ * 'slp_url_callback()' - SLP service url callback
  */
 
-void
-cupsdStopBrowsing(void)
+static SLPBoolean                      /* O - TRUE = OK, FALSE = error */
+slp_url_callback(
+    SLPHandle      hslp,               /* I - SLP handle */
+    const char     *srvurl,            /* I - URL of service */
+    unsigned short lifetime,           /* I - Life of service */
+    SLPError       errcode,            /* I - Existing error code */
+    void           *cookie)            /* I - Pointer to service list */
 {
-  if (!Browsing || !(BrowseLocalProtocols | BrowseRemoteProtocols))
-    return;
+  slpsrvurl_t  *s,                     /* New service entry */
+               **head;                 /* Pointer to head of entry */
 
-  if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_CUPS) &&
-      BrowseSocket >= 0)
-  {
-   /*
-    * Close the socket and remove it from the input selection set.
-    */
 
-#ifdef WIN32
-    closesocket(BrowseSocket);
-#else
-    close(BrowseSocket);
-#endif /* WIN32 */
+ /*
+  * Let the compiler know we won't be using these vars...
+  */
 
-    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                   "cupsdStopBrowsing: Removing fd %d from InputSet...",
-                   BrowseSocket);
+  (void)hslp;
+  (void)lifetime;
 
-    FD_CLR(BrowseSocket, InputSet);
-    BrowseSocket = -1;
-  }
+ /*
+  * Bail if there was an error
+  */
 
-#ifdef HAVE_LIBSLP
-  if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP)
-  {
-   /* 
-    * Close SLP handle...
-    */
+  if (errcode != SLP_OK)
+    return (SLP_TRUE);
 
-    SLPClose(BrowseSLPHandle);
-  }
-#endif /* HAVE_LIBSLP */
-}
+ /*
+  * Grab the head of the list...
+  */
 
+  head = (slpsrvurl_t**)cookie;
 
-/*
* 'cupsdStopPolling()' - Stop polling servers as needed.
- */
+ /*
 * Allocate a *temporary* slpsrvurl_t to hold this entry.
 */
 
-void
-cupsdStopPolling(void)
-{
-  int                  i;              /* Looping var */
-  cupsd_dirsvc_poll_t  *pollp;         /* Current polling server */
+  if ((s = (slpsrvurl_t *)calloc(1, sizeof(slpsrvurl_t))) == NULL)
+    return (SLP_FALSE);
 
+ /*
+  * Copy the SLP service URL...
+  */
 
-  if (PollPipe >= 0)
-  {
-    cupsdStatBufDelete(PollStatusBuffer);
-    close(PollPipe);
+  strlcpy(s->url, srvurl, sizeof(s->url));
 
-    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                    "cupsdStopPolling: removing fd %d from InputSet.", PollPipe);
-    FD_CLR(PollPipe, InputSet);
+ /* 
+  * Link the SLP service URL into the head of the list
+  */
 
-    PollPipe         = -1;
-    PollStatusBuffer = NULL;
-  }
+  if (*head)
+    s->next = *head;
 
-  for (i = 0, pollp = Polled; i < NumPolled; i ++, pollp ++)
-    if (pollp->pid)
-      cupsdEndProcess(pollp->pid, 0);
+  *head = s;
+
+  return (SLP_TRUE);
 }
+#endif /* HAVE_LIBSLP */
 
 
 /*
- * 'cupsdUpdateCUPSBrowse()' - Update the browse lists using the CUPS protocol.
+ * 'update_cups_browse()' - Update the browse lists using the CUPS protocol.
  */
 
-void
-cupsdUpdateCUPSBrowse(void)
+static void
+update_cups_browse(void)
 {
   int          i;                      /* Looping var */
   int          auth;                   /* Authorization status */
@@ -2012,15 +3568,11 @@ cupsdUpdateCUPSBrowse(void)
   unsigned     type;                   /* Printer type */
   unsigned     state;                  /* Printer state */
   char         uri[HTTP_MAX_URI],      /* Printer URI */
-               method[HTTP_MAX_URI],   /* Method portion of URI */
-               username[HTTP_MAX_URI], /* Username portion of URI */
                host[HTTP_MAX_URI],     /* Host portion of URI */
                resource[HTTP_MAX_URI], /* Resource portion of URI */
                info[IPP_MAX_NAME],     /* Information string */
                location[IPP_MAX_NAME], /* Location string */
                make_model[IPP_MAX_NAME];/* Make and model string */
-  int          port;                   /* Port portion of URI */
-  cupsd_netif_t        *iface;                 /* Network interface */
   int          num_attrs;              /* Number of attributes */
   cups_option_t        *attrs;                 /* Attributes */
 
@@ -2147,13 +3699,13 @@ cupsdUpdateCUPSBrowse(void)
   if (auth == AUTH_DENY)
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG,
-                    "cupsdUpdateCUPSBrowse: Refused %d bytes from %s", bytes,
+                    "update_cups_browse: Refused %d bytes from %s", bytes,
                     srcname);
     return;
   }
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdUpdateCUPSBrowse: (%d bytes from %s) %s", bytes,
+                  "update_cups_browse: (%d bytes from %s) %s", bytes,
                  srcname, packet);
 
  /*
@@ -2163,7 +3715,7 @@ cupsdUpdateCUPSBrowse(void)
   if (sscanf(packet, "%x%x%1023s", &type, &state, uri) < 3)
   {
     cupsdLogMessage(CUPSD_LOG_WARN,
-                    "cupsdUpdateCUPSBrowse: Garbled browse packet - %s", packet);
+                    "update_cups_browse: Garbled browse packet - %s", packet);
     return;
   }
 
@@ -2181,466 +3733,293 @@ cupsdUpdateCUPSBrowse(void)
     */
 
     for (i = 0, pptr ++;
-         i < (sizeof(location) - 1) && *pptr && *pptr != '\"';
-         i ++, pptr ++)
-      location[i] = *pptr;
-
-    if (i)
-      location[i] = '\0';
-
-    if (*pptr == '\"')
-      pptr ++;
-
-    while (*pptr && isspace(*pptr & 255))
-      pptr ++;
-
-    if (*pptr == '\"')
-    {
-      for (i = 0, pptr ++;
-           i < (sizeof(info) - 1) && *pptr && *pptr != '\"';
-           i ++, pptr ++)
-       info[i] = *pptr;
-
-      info[i] = '\0';
-
-      if (*pptr == '\"')
-       pptr ++;
-
-      while (*pptr && isspace(*pptr & 255))
-       pptr ++;
-
-      if (*pptr == '\"')
-      {
-       for (i = 0, pptr ++;
-             i < (sizeof(make_model) - 1) && *pptr && *pptr != '\"';
-             i ++, pptr ++)
-         make_model[i] = *pptr;
-
-       if (*pptr == '\"')
-         pptr ++;
-
-       make_model[i] = '\0';
-
-        if (*pptr)
-         num_attrs = cupsParseOptions(pptr, num_attrs, &attrs);
-      }
-    }
-  }
-
-  DEBUG_puts(packet);
-  DEBUG_printf(("type=%x, state=%x, uri=\"%s\"\n"
-                "location=\"%s\", info=\"%s\", make_model=\"%s\"\n",
-               type, state, uri, location, info, make_model));
-
- /*
-  * Pull the URI apart to see if this is a local or remote printer...
-  */
-
-  httpSeparateURI(HTTP_URI_CODING_ALL, uri, method, sizeof(method), username,
-                  sizeof(username), host, sizeof(host), &port, resource,
-                 sizeof(resource));
-
-  DEBUG_printf(("host=\"%s\", ServerName=\"%s\"\n", host, ServerName));
-
- /*
-  * Check for packets from the local server...
-  */
-
-  if (!strcasecmp(host, ServerName) && port == LocalPort)
-  {
-    cupsFreeOptions(num_attrs, attrs);
-    return;
-  }
-
-  cupsdNetIFUpdate();
-
-  for (iface = NetIFList; iface != NULL; iface = iface->next)
-    if (!strcasecmp(host, iface->hostname) && port == iface->port)
-    {
-      cupsFreeOptions(num_attrs, attrs);
-      return;
-    }
-
- /*
-  * Do relaying...
-  */
-
-  for (i = 0; i < NumRelays; i ++)
-    if (cupsdCheckAuth(address, srcname, len, 1, &(Relays[i].from)))
-      if (sendto(BrowseSocket, packet, bytes, 0,
-                 (struct sockaddr *)&(Relays[i].to),
-                sizeof(http_addr_t)) <= 0)
-      {
-       cupsdLogMessage(CUPSD_LOG_ERROR,
-                       "cupsdUpdateCUPSBrowse: sendto failed for relay %d - %s.",
-                       i + 1, strerror(errno));
-       cupsFreeOptions(num_attrs, attrs);
-       return;
-      }
-
- /*
-  * Process the browse data...
-  */
-
-  cupsdProcessBrowseData(uri, (cups_ptype_t)type, (ipp_pstate_t)state, location,
-                         info, make_model, num_attrs, attrs);
-  cupsFreeOptions(num_attrs, attrs);
-}
-
-
-/*
- * 'cupsdUpdatePolling()' - Read status messages from the poll daemons.
- */
-
-void
-cupsdUpdatePolling(void)
-{
-  char         *ptr,                   /* Pointer to end of line in buffer */
-               message[1024];          /* Pointer to message text */
-  int          loglevel;               /* Log level for message */
-
-
-  while ((ptr = cupsdStatBufUpdate(PollStatusBuffer, &loglevel,
-                                   message, sizeof(message))) != NULL)
-    if (!strchr(PollStatusBuffer->buffer, '\n'))
-      break;
-
-  if (ptr == NULL)
-  {
-   /*
-    * All polling processes have died; stop polling...
-    */
-
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "cupsdUpdatePolling: all polling processes have exited!");
-    cupsdStopPolling();
-  }
-}
-
-
-#ifdef HAVE_LIBSLP 
-/*
- * 'cupsdUpdateSLPBrowse()' - Get browsing information via SLP.
- */
-
-void
-cupsdUpdateSLPBrowse(void)
-{
-  slpsrvurl_t          *s,             /* Temporary list of service URLs */
-                       *next;          /* Next service in list */
-  cupsd_printer_t      p;              /* Printer information */
-  const char           *uri;           /* Pointer to printer URI */
-  char                 method[HTTP_MAX_URI],
-                                       /* Method portion of URI */
-                       username[HTTP_MAX_URI],
-                                       /* Username portion of URI */
-                       host[HTTP_MAX_URI],
-                                       /* Host portion of URI */
-                       resource[HTTP_MAX_URI];
-                                       /* Resource portion of URI */
-  int                  port;           /* Port portion of URI */
-
-
-  cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdUpdateSLPBrowse() Start...");
-
- /*
-  * Reset the refresh time...
-  */
-
-  BrowseSLPRefresh = time(NULL) + BrowseInterval;
-
- /* 
-  * Poll for remote printers using SLP...
-  */
-
-  s = NULL;
-
-  SLPFindSrvs(BrowseSLPHandle, SLP_CUPS_SRVTYPE, "", "",
-             slp_url_callback, &s);
-
- /*
-  * Loop through the list of available printers...
-  */
-
-  for (; s; s = next)
-  {
-   /*
-    * Save the "next" pointer...
-    */
-
-    next = s->next;
-
-   /* 
-    * Load a cupsd_printer_t structure with the SLP service attributes...
-    */
-
-    SLPFindAttrs(BrowseSLPHandle, s->url, "", "", slp_attr_callback, &p);
-
-   /*
-    * Process this printer entry...
-    */
-
-    uri = s->url + SLP_CUPS_SRVLEN + 1;
+         i < (sizeof(location) - 1) && *pptr && *pptr != '\"';
+         i ++, pptr ++)
+      location[i] = *pptr;
 
-    if (!strncmp(uri, "http://", 7) || !strncmp(uri, "ipp://", 6))
-    {
-     /*
-      * Pull the URI apart to see if this is a local or remote printer...
-      */
+    if (i)
+      location[i] = '\0';
 
-      httpSeparateURI(HTTP_URI_CODING_ALL, uri, method, sizeof(method),
-                      username, sizeof(username), host, sizeof(host), &port,
-                     resource, sizeof(resource));
+    if (*pptr == '\"')
+      pptr ++;
 
-      if (strcasecmp(host, ServerName) == 0)
-       continue;
+    while (*pptr && isspace(*pptr & 255))
+      pptr ++;
 
-     /*
-      * OK, at least an IPP printer, see if it is a CUPS printer or
-      * class...
-      */
+    if (*pptr == '\"')
+    {
+      for (i = 0, pptr ++;
+           i < (sizeof(info) - 1) && *pptr && *pptr != '\"';
+           i ++, pptr ++)
+       info[i] = *pptr;
 
-      if (strstr(uri, "/printers/") != NULL)
-        cupsdProcessBrowseData(uri, p.type, IPP_PRINTER_IDLE, p.location,
-                         p.info, p.make_model, 0, NULL);
-      else if (strstr(uri, "/classes/") != NULL)
-        cupsdProcessBrowseData(uri, p.type | CUPS_PRINTER_CLASS, IPP_PRINTER_IDLE,
-                         p.location, p.info, p.make_model, 0, NULL);
-    }
+      info[i] = '\0';
 
-   /*
-    * Free this listing...
-    */
+      if (*pptr == '\"')
+       pptr ++;
 
-    free(s);
-  }       
+      while (*pptr && isspace(*pptr & 255))
+       pptr ++;
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdUpdateSLPBrowse() End...");
-}
+      if (*pptr == '\"')
+      {
+       for (i = 0, pptr ++;
+             i < (sizeof(make_model) - 1) && *pptr && *pptr != '\"';
+             i ++, pptr ++)
+         make_model[i] = *pptr;
 
+       if (*pptr == '\"')
+         pptr ++;
 
-/*
- * 'slp_attr_callback()' - SLP attribute callback 
- */
+       make_model[i] = '\0';
 
-static SLPBoolean                      /* O - SLP_TRUE for success */
-slp_attr_callback(
-    SLPHandle  hslp,                   /* I - SLP handle */
-    const char *attrlist,              /* I - Attribute list */
-    SLPError   errcode,                        /* I - Parsing status for this attr */
-    void       *cookie)                        /* I - Current printer */
-{
-  char                 *tmp = 0;
-  cupsd_printer_t      *p = (cupsd_printer_t*)cookie;
+        if (*pptr)
+         num_attrs = cupsParseOptions(pptr, num_attrs, &attrs);
+      }
+    }
+  }
 
+  DEBUG_puts(packet);
+  DEBUG_printf(("type=%x, state=%x, uri=\"%s\"\n"
+                "location=\"%s\", info=\"%s\", make_model=\"%s\"\n",
+               type, state, uri, location, info, make_model));
 
  /*
-  * Let the compiler know we won't be using these...
+  * Pull the URI apart to see if this is a local or remote printer...
   */
 
-  (void)hslp;
+  if (is_local_queue(uri, host, sizeof(host), resource, sizeof(resource)))
+  {
+    cupsFreeOptions(num_attrs, attrs);
+    return;
+  }
 
  /*
-  * Bail if there was an error
+  * Do relaying...
   */
 
-  if (errcode != SLP_OK)
-    return (SLP_TRUE);
+  for (i = 0; i < NumRelays; i ++)
+    if (cupsdCheckAuth(address, srcname, len, 1, &(Relays[i].from)))
+      if (sendto(BrowseSocket, packet, bytes, 0,
+                 (struct sockaddr *)&(Relays[i].to),
+                httpAddrLength(&(Relays[i].to))) <= 0)
+      {
+       cupsdLogMessage(CUPSD_LOG_ERROR,
+                       "update_cups_browse: sendto failed for relay %d - %s.",
+                       i + 1, strerror(errno));
+       cupsFreeOptions(num_attrs, attrs);
+       return;
+      }
 
  /*
-  * Parse the attrlist to obtain things needed to build CUPS browse packet
+  * Process the browse data...
   */
 
-  memset(p, 0, sizeof(cupsd_printer_t));
-
-  p->type = CUPS_PRINTER_REMOTE;
-
-  if (slp_get_attr(attrlist, "(printer-location=", &(p->location)))
-    return (SLP_FALSE);
-  if (slp_get_attr(attrlist, "(printer-info=", &(p->info)))
-    return (SLP_FALSE);
-  if (slp_get_attr(attrlist, "(printer-make-and-model=", &(p->make_model)))
-    return (SLP_FALSE);
-
-  if (slp_get_attr(attrlist, "(color-supported=", &tmp))
-    return (SLP_FALSE);
-  if (strcasecmp(tmp, "true") == 0)
-    p->type |= CUPS_PRINTER_COLOR;
-
-  if (slp_get_attr(attrlist, "(finishings-supported=", &tmp))
-    return (SLP_FALSE);
-  if (strstr(tmp, "staple"))
-    p->type |= CUPS_PRINTER_STAPLE;
-  if (strstr(tmp, "bind"))
-    p->type |= CUPS_PRINTER_BIND;
-  if (strstr(tmp, "punch"))
-    p->type |= CUPS_PRINTER_PUNCH;
-
-  if (slp_get_attr(attrlist, "(sides-supported=", &tmp))
-    return (SLP_FALSE);
-  if (strstr(tmp,"two-sided"))
-    p->type |= CUPS_PRINTER_DUPLEX;
-
-  cupsdClearString(&tmp);
-
-  return (SLP_TRUE);
+  process_browse_data(uri, host, resource, (cups_ptype_t)type,
+                      (ipp_pstate_t)state, location, info, make_model,
+                     num_attrs, attrs);
 }
 
 
 /*
- * 'slp_dereg_printer()' - SLPDereg() the specified printer
+ * 'update_lpd()' - Update the LPD configuration as needed.
  */
 
-static void 
-slp_dereg_printer(cupsd_printer_t *p)  /* I - Printer */
+static void
+update_lpd(int onoff)                  /* - 1 = turn on, 0 = turn off */
 {
-  char srvurl[HTTP_MAX_URI];           /* Printer service URI */
-
-
-  cupsdLogMessage(CUPSD_LOG_DEBUG, "slp_dereg_printer: printer=\"%s\"", p->name);
+  if (!LPDConfigFile)
+    return;
 
-  if (!(p->type & CUPS_PRINTER_REMOTE))
+  if (!strncmp(LPDConfigFile, "xinetd:///", 10))
   {
    /*
-    * Make the SLP service URL that conforms to the IANA 
-    * 'printer:' template.
+    * Enable/disable LPD via the xinetd.d config file for cups-lpd...
     */
 
-    snprintf(srvurl, sizeof(srvurl), SLP_CUPS_SRVTYPE ":%s", p->uri);
+    char       newfile[1024];          /* New cups-lpd.N file */
+    cups_file_t        *ofp,                   /* Original file pointer */
+               *nfp;                   /* New file pointer */
+    char       line[1024];             /* Line from file */
 
-   /*
-    * Deregister the printer...
-    */
 
-    SLPDereg(BrowseSLPHandle, srvurl, slp_reg_callback, 0);
-  }
-}
+    snprintf(newfile, sizeof(newfile), "%s.N", LPDConfigFile + 9);
 
+    if ((ofp = cupsFileOpen(LPDConfigFile + 9, "r")) == NULL)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open \"%s\" - %s",
+                      LPDConfigFile + 9, strerror(errno));
+      return;
+    }
 
-/*
- * 'slp_get_attr()' - Get an attribute from an SLP registration.
- */
+    if ((nfp = cupsFileOpen(newfile, "w")) == NULL)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create \"%s\" - %s",
+                      newfile, strerror(errno));
+      cupsFileClose(ofp);
+      return;
+    }
 
-static int                             /* O - 0 on success */
-slp_get_attr(const char *attrlist,     /* I - Attribute list string */
-             const char *tag,          /* I - Name of attribute */
-             char       **valbuf)      /* O - Value */
-{
-  char *ptr1,                          /* Pointer into string */
-       *ptr2;                          /* ... */
+   /*
+    * Copy all of the lines from the cups-lpd file...
+    */
 
+    while (cupsFileGets(ofp, line, sizeof(line)))
+    {
+      if (line[0] == '{')
+      {
+        cupsFilePrintf(nfp, "%s\n", line);
+        snprintf(line, sizeof(line), "\tdisable = %s",
+                onoff ? "no" : "yes");
+      }
+      else if (strstr(line, "disable ="))
+        continue;
 
-  cupsdClearString(valbuf);
+      cupsFilePrintf(nfp, "%s\n", line);
+    }
 
-  if ((ptr1 = strstr(attrlist, tag)) != NULL)
+    cupsFileClose(nfp);
+    cupsFileClose(ofp);
+    rename(newfile, LPDConfigFile + 9);
+  }
+  else if (!strncmp(LPDConfigFile, "launchd:///", 11))
   {
-    ptr1 += strlen(tag);
-
-    if ((ptr2 = strchr(ptr1,')')) != NULL)
-    {
-     /*
-      * Copy the value...
-      */
+   /*
+    * Enable/disable LPD via the launchctl command...
+    */
 
-      *valbuf = calloc(ptr2 - ptr1 + 1, 1);
-      strncpy(*valbuf, ptr1, ptr2 - ptr1);
+    char       *argv[5],               /* Arguments for command */
+               *envp[MAX_ENV];         /* Environment for command */
+    int                pid;                    /* Process ID */
 
-     /*
-      * Dequote the value...
-      */
 
-      for (ptr1 = *valbuf; *ptr1; ptr1 ++)
-       if (*ptr1 == '\\' && ptr1[1])
-         _cups_strcpy(ptr1, ptr1 + 1);
+    cupsdLoadEnv(envp, (int)(sizeof(envp) / sizeof(envp[0])));
+    argv[0] = (char *)"launchctl";
+    argv[1] = (char *)(onoff ? "load" : "unload");
+    argv[2] = (char *)"-w";
+    argv[3] = LPDConfigFile + 10;
+    argv[4] = NULL;
 
-      return (0);
-    }
+    cupsdStartProcess("/bin/launchctl", argv, envp, -1, -1, -1, -1, -1, 1, &pid);
   }
-
-  return (-1);
 }
 
 
 /*
- * 'slp_reg_callback()' - Empty SLPRegReport.
+ * 'update_polling()' - Read status messages from the poll daemons.
  */
 
 static void
-slp_reg_callback(SLPHandle hslp,       /* I - SLP handle */
-                 SLPError  errcode,    /* I - Error code, if any */
-                void      *cookie)     /* I - App data */
+update_polling(void)
 {
-  (void)hslp;
-  (void)errcode;
-  (void)cookie;
+  char         *ptr,                   /* Pointer to end of line in buffer */
+               message[1024];          /* Pointer to message text */
+  int          loglevel;               /* Log level for message */
 
-  return;
+
+  while ((ptr = cupsdStatBufUpdate(PollStatusBuffer, &loglevel,
+                                   message, sizeof(message))) != NULL)
+    if (!strchr(PollStatusBuffer->buffer, '\n'))
+      break;
+
+  if (ptr == NULL && !PollStatusBuffer->bufused)
+  {
+   /*
+    * All polling processes have died; stop polling...
+    */
+
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "update_polling: all polling processes have exited!");
+    cupsdStopPolling();
+  }
 }
 
 
 /*
- * 'slp_url_callback()' - SLP service url callback
+ * 'update_smb()' - Update the SMB configuration as needed.
  */
 
-static SLPBoolean                      /* O - TRUE = OK, FALSE = error */
-slp_url_callback(
-    SLPHandle      hslp,               /* I - SLP handle */
-    const char     *srvurl,            /* I - URL of service */
-    unsigned short lifetime,           /* I - Life of service */
-    SLPError       errcode,            /* I - Existing error code */
-    void           *cookie)            /* I - Pointer to service list */
+static void
+update_smb(int onoff)                  /* I - 1 = turn on, 0 = turn off */
 {
-  slpsrvurl_t  *s,                     /* New service entry */
-               **head;                 /* Pointer to head of entry */
+  if (!SMBConfigFile)
+    return;
 
+  if (!strncmp(SMBConfigFile, "samba:///", 9))
+  {
+   /*
+    * Enable/disable SMB via the specified smb.conf config file...
+    */
 
- /*
-  * Let the compiler know we won't be using these vars...
-  */
+    char       newfile[1024];          /* New smb.conf.N file */
+    cups_file_t        *ofp,                   /* Original file pointer */
+               *nfp;                   /* New file pointer */
+    char       line[1024];             /* Line from file */
+    int                in_printers;            /* In [printers] section? */
 
-  (void)hslp;
-  (void)lifetime;
 
- /*
-  * Bail if there was an error
-  */
+    snprintf(newfile, sizeof(newfile), "%s.N", SMBConfigFile + 8);
 
-  if (errcode != SLP_OK)
-    return (SLP_TRUE);
+    if ((ofp = cupsFileOpen(SMBConfigFile + 8, "r")) == NULL)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open \"%s\" - %s",
+                      SMBConfigFile + 8, strerror(errno));
+      return;
+    }
 
- /*
-  * Grab the head of the list...
-  */
+    if ((nfp = cupsFileOpen(newfile, "w")) == NULL)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create \"%s\" - %s",
+                      newfile, strerror(errno));
+      cupsFileClose(ofp);
+      return;
+    }
 
-  head = (slpsrvurl_t**)cookie;
+   /*
+    * Copy all of the lines from the smb.conf file...
+    */
 
- /*
-  * Allocate a *temporary* slpsrvurl_t to hold this entry.
-  */
+    in_printers = 0;
 
-  if ((s = (slpsrvurl_t *)calloc(1, sizeof(slpsrvurl_t))) == NULL)
-    return (SLP_FALSE);
+    while (cupsFileGets(ofp, line, sizeof(line)))
+    {
+      if (in_printers && strstr(line, "printable ="))
+        snprintf(line, sizeof(line), "    printable = %s",
+                onoff ? "yes" : "no");
 
- /*
-  * Copy the SLP service URL...
-  */
+      cupsFilePrintf(nfp, "%s\n", line);
 
-  strlcpy(s->url, srvurl, sizeof(s->url));
+      if (line[0] == '[')
+        in_printers = !strcmp(line, "[printers]");
+    }
 
- /* 
-  * Link the SLP service URL into the head of the list
-  */
+    cupsFileClose(nfp);
+    cupsFileClose(ofp);
+    rename(newfile, SMBConfigFile + 8);
+  }
+  else if (!strncmp(SMBConfigFile, "launchd:///", 11))
+  {
+   /*
+    * Enable/disable SMB via the launchctl command...
+    */
 
-  if (*head)
-    s->next = *head;
+    char       *argv[5],               /* Arguments for command */
+               *envp[MAX_ENV];         /* Environment for command */
+    int                pid;                    /* Process ID */
 
-  *head = s;
 
-  return (SLP_TRUE);
+    cupsdLoadEnv(envp, (int)(sizeof(envp) / sizeof(envp[0])));
+    argv[0] = (char *)"launchctl";
+    argv[1] = (char *)(onoff ? "load" : "unload");
+    argv[2] = (char *)"-w";
+    argv[3] = SMBConfigFile + 10;
+    argv[4] = NULL;
+
+    cupsdStartProcess("/bin/launchctl", argv, envp, -1, -1, -1, -1, -1, 1, &pid);
+  }
 }
-#endif /* HAVE_LIBSLP */
 
 
 /*
- * End of "$Id: dirsvc.c 5023 2006-01-29 14:39:44Z mike $".
+ * End of "$Id: dirsvc.c 7003 2007-10-01 23:10:13Z mike $".
  */