diff -up cups-1.4.7/cgi-bin/admin.c.avahi-5-services cups-1.4.7/cgi-bin/admin.c

--- cups-1.4.7/cgi-bin/admin.c.avahi-5-services	2011-03-04 19:28:38.000000000 +0000

+++ cups-1.4.7/cgi-bin/admin.c	2011-06-28 12:54:55.450853624 +0100

@@ -1643,7 +1643,7 @@ do_config_server(http_t *http)		/* I - H

       else

 	local_protocols[0] = '\0';

-#ifdef HAVE_DNSSD

+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)

       if (cgiGetVariable("BROWSE_LOCAL_DNSSD"))

       {

 	if (local_protocols[0])

@@ -1651,7 +1651,7 @@ do_config_server(http_t *http)		/* I - H

 	else

 	  strcat(local_protocols, "dnssd");

       }

-#endif /* HAVE_DNSSD */

+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */

 #ifdef HAVE_LDAP

       if (cgiGetVariable("BROWSE_LOCAL_LDAP"))

@@ -2718,9 +2718,9 @@ do_menu(http_t *http)			/* I - HTTP conn

 #endif /* HAVE_GSSAPI */

   cgiSetVariable("KERBEROS", "");

-#ifdef HAVE_DNSSD

+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)

   cgiSetVariable("HAVE_DNSSD", "1");

-#endif /* HAVE_DNSSD */

+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */

 #ifdef HAVE_LDAP

   cgiSetVariable("HAVE_LDAP", "1");

diff -up cups-1.4.7/scheduler/client.c.avahi-5-services cups-1.4.7/scheduler/client.c

--- cups-1.4.7/scheduler/client.c.avahi-5-services	2011-01-22 00:07:22.000000000 +0000

+++ cups-1.4.7/scheduler/client.c	2011-06-28 12:54:55.454853552 +0100

@@ -5095,7 +5095,7 @@ valid_host(cupsd_client_t *con)		/* I - 

 	    !strncmp(host, "[::1]:", 6));

   }

-#ifdef HAVE_DNSSD

+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)

  /*

   * Check if the hostname is something.local (Bonjour); if so, allow it.

   */

@@ -5104,7 +5104,7 @@ valid_host(cupsd_client_t *con)		/* I - 

       (!strcasecmp(end, ".local") || !strncasecmp(end, ".local:", 7) ||

        !strcasecmp(end, ".local.") || !strncasecmp(end, ".local.:", 8)))

     return (1);

-#endif /* HAVE_DNSSD */

+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */

  /*

   * Check if the hostname is an IP address...

diff -up cups-1.4.7/scheduler/dirsvc.c.avahi-5-services cups-1.4.7/scheduler/dirsvc.c

--- cups-1.4.7/scheduler/dirsvc.c.avahi-5-services	2011-06-28 12:51:40.386368251 +0100

+++ cups-1.4.7/scheduler/dirsvc.c	2011-06-28 12:54:55.462853408 +0100

@@ -27,6 +27,7 @@

  *   ldap_connect()             - Start new LDAP connection

  *   ldap_reconnect()           - Reconnect to LDAP Server

  *   ldap_disconnect()          - Disconnect from LDAP Server

+ *   cupsdStartAvahiClient()    - Start an Avahi client if needed

  *   cupsdStartBrowsing()       - Start sending and receiving broadcast

  *                                information.

  *   cupsdStartPolling()        - Start polling servers as needed.

@@ -83,6 +84,7 @@

  */

 #include "cupsd.h"

+#include <assert.h>

 #include <grp.h>

 #ifdef HAVE_DNSSD

@@ -97,8 +99,18 @@

 #    endif /* HAVE_SYSTEMCONFIGURATION */

 #  endif /* __APPLE__ */

 #endif /* HAVE_DNSSD */

+#ifdef HAVE_AVAHI

+#  include <avahi-common/domain.h>

+#endif /* HAVE_AVAHI */

+#ifdef HAVE_DNSSD

+typedef char *cupsd_txt_record_t;

+#endif /* HAVE_DNSSD */

+#ifdef HAVE_AVAHI

+typedef AvahiStringList *cupsd_txt_record_t;

+#endif /* HAVE_AVAHI */

+

 /*

  * Local functions...

  */

@@ -159,15 +171,20 @@ static void	update_polling(void);

 static void	update_smb(int onoff);

+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)

+static cupsd_txt_record_t dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,

+					      int for_lpd);

+static void	dnssdDeregisterPrinter(cupsd_printer_t *p);

+static int	dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);

+static void	dnssdRegisterPrinter(cupsd_printer_t *p);

+static void	dnssdStop(void);

+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */

+

 #ifdef HAVE_DNSSD

 #  ifdef HAVE_COREFOUNDATION

 static void	dnssdAddAlias(const void *key, const void *value,

 		              void *context);

 #  endif /* HAVE_COREFOUNDATION */

-static char	*dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,

-		                     int for_lpd);

-static int	dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);

-static void	dnssdDeregisterPrinter(cupsd_printer_t *p);

 static char	*dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2],

 		                    int count);

 static void	dnssdRegisterCallback(DNSServiceRef sdRef,

@@ -175,11 +192,20 @@ static void	dnssdRegisterCallback(DNSSer

 				      DNSServiceErrorType errorCode,

 				      const char *name, const char *regtype,

 				      const char *domain, void *context);

-static void	dnssdRegisterPrinter(cupsd_printer_t *p);

-static void	dnssdStop(void);

 static void	dnssdUpdate(void);

 #endif /* HAVE_DNSSD */

+#ifdef HAVE_AVAHI

+static AvahiStringList *avahiPackTxtRecord(char *keyvalue[][2],

+					   int count);

+static void	avahi_entry_group_cb (AvahiEntryGroup *group,

+				      AvahiEntryGroupState state,

+				      void *userdata);

+static void	avahi_client_cb (AvahiClient *client,

+				 AvahiClientState state,

+				 void *userdata);

+#endif /* HAVE_AVAHI */

+

 #ifdef HAVE_LDAP

 static const char * const ldap_attrs[] =/* CUPS LDAP attributes */

 		{

@@ -283,10 +309,10 @@ cupsdDeregisterPrinter(

     ldap_dereg_printer(p);

 #endif /* HAVE_LDAP */

-#ifdef HAVE_DNSSD

-  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)

+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)

+  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD))

     dnssdDeregisterPrinter(p);

-#endif /* HAVE_DNSSD */

+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */

 }

@@ -694,10 +720,10 @@ cupsdRegisterPrinter(cupsd_printer_t *p)

     slpRegisterPrinter(p); */

 #endif /* HAVE_LIBSLP */

-#ifdef HAVE_DNSSD

-  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)

+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)

+  if ((BrowseLocalProtocols & BROWSE_DNSSD))

     dnssdRegisterPrinter(p);

-#endif /* HAVE_DNSSD */

+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */

 }

@@ -1411,6 +1437,23 @@ ldap_disconnect(LDAP *ld)		/* I - LDAP h

 }

 #endif /* HAVE_LDAP */

+#ifdef HAVE_AVAHI

+/*

+ * 'cupsdStartAvahiClient()' - Start an Avahi client if needed

+ */

+

+void

+cupsdStartAvahiClient(void) {

+  if (!AvahiCupsClient && !AvahiCupsClientConnecting)

+  {

+    if (!AvahiCupsPollHandle)

+      AvahiCupsPollHandle = avahi_cups_poll_new ();

+    if (AvahiCupsPollHandle)

+      avahi_client_new (avahi_cups_poll_get (AvahiCupsPollHandle),

+			AVAHI_CLIENT_NO_FAIL, avahi_client_cb, NULL, NULL);

+  }

+}

+#endif /* HAVE_AVAHI */

 /*

  * 'cupsdStartBrowsing()' - Start sending and receiving broadcast information.

@@ -1535,13 +1578,16 @@ cupsdStartBrowsing(void)

   else

     BrowseSocket = -1;

-#ifdef HAVE_DNSSD

+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)

   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD)

   {

+#ifdef HAVE_DNSSD

     DNSServiceErrorType error;		/* Error from service creation */

+#endif /* HAVE_DNSSD */

     cupsd_listener_t	*lis;		/* Current listening socket */

+#ifdef HAVE_DNSSD

    /*

     * First create a "master" connection for all registrations...

     */

@@ -1566,6 +1612,7 @@ cupsdStartBrowsing(void)

       fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);

       cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL);

+#endif /* HAVE_DNSSD */

      /*

       * Then get the port we use for registrations.  If we are not listening

@@ -1607,9 +1654,16 @@ cupsdStartBrowsing(void)

       */

       cupsdUpdateDNSSDName();

+#ifdef HAVE_DNSSD

     }

-  }

 #endif /* HAVE_DNSSD */

+  }

+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */

+

+#ifdef HAVE_AVAHI

+  if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD)

+    cupsdStartAvahiClient();

+#endif /* HAVE_AVAHI */

 #ifdef HAVE_LIBSLP

   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP)

@@ -1835,10 +1889,10 @@ cupsdStopBrowsing(void)

     BrowseSocket = -1;

   }

-#ifdef HAVE_DNSSD

-  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)

+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)

+  if ((BrowseLocalProtocols & BROWSE_DNSSD))

     dnssdStop();

-#endif /* HAVE_DNSSD */

+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */

 #ifdef HAVE_LIBSLP

   if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) &&

@@ -1903,7 +1957,7 @@ cupsdStopPolling(void)

 }

-#ifdef HAVE_DNSSD

+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)

 /*

  * 'cupsdUpdateDNSSDName()' - Update the computer name we use for browsing...

  */

@@ -1911,7 +1965,12 @@ cupsdStopPolling(void)

 void

 cupsdUpdateDNSSDName(void)

 {

+#ifdef HAVE_DNSSD

   DNSServiceErrorType error;		/* Error from service creation */

+#endif /* HAVE_DNSSD */

+#ifdef HAVE_AVAHI

+  int		ret;			/* Error from service creation */

+#endif /* HAVE_AVAHI */

   char		webif[1024];		/* Web interface share name */

 #ifdef HAVE_COREFOUNDATION_H

   SCDynamicStoreRef sc;			/* Context for dynamic store */

@@ -2043,6 +2102,7 @@ cupsdUpdateDNSSDName(void)

     else

       strlcpy(webif, "CUPS Web Interface", sizeof(webif));

+#ifdef HAVE_DNSSD

     if (WebIFRef)

       DNSServiceRefDeallocate(WebIFRef);

@@ -2055,6 +2115,42 @@ cupsdUpdateDNSSDName(void)

 				    NULL)) != kDNSServiceErr_NoError)

       cupsdLogMessage(CUPSD_LOG_ERROR,

 		      "DNS-SD web interface registration failed: %d", error);

+#endif /* HAVE_DNSSD */

+

+#ifdef HAVE_AVAHI

+    if (!AvahiCupsClient)

+     /*

+      * Client not yet running.

+      */

+      return;

+

+    if (AvahiWebIFGroup)

+      avahi_entry_group_reset (AvahiWebIFGroup);

+    else

+      AvahiWebIFGroup = avahi_entry_group_new (AvahiCupsClient,

+					       avahi_entry_group_cb,

+					       NULL);

+

+    if (AvahiWebIFGroup)

+    {

+      ret = avahi_entry_group_add_service (AvahiWebIFGroup,

+					   AVAHI_IF_UNSPEC,

+					   AVAHI_PROTO_UNSPEC,

+					   0, /* flags */

+					   webif, /* name */

+					   "_http._tcp", /* type */

+					   NULL, /* domain */

+					   NULL, /* host */

+					   DNSSDPort, /* port */

+					   "path=/", NULL);

+      if (ret == 0)

+	ret = avahi_entry_group_commit (AvahiWebIFGroup);

+

+      if (ret != 0)

+	cupsdLogMessage (CUPSD_LOG_ERROR,

+			 "Avahi web interface registration failed: %d", ret);

+    }

+#endif /* HAVE_AVAHI */

   }

 }

 #endif /* HAVE_DNSSD */

@@ -2300,162 +2396,7 @@ dequote(char       *d,			/* I - Destinat

 }

-#ifdef HAVE_DNSSD

-#  ifdef HAVE_COREFOUNDATION

-/*

- * 'dnssdAddAlias()' - Add a DNS-SD alias name.

- */

-

-static void

-dnssdAddAlias(const void *key,		/* I - Key */

-              const void *value,	/* I - Value (domain) */

-	      void       *context)	/* I - Unused */

-{

-  char	valueStr[1024],			/* Domain string */

-	hostname[1024];			/* Complete hostname */

-

-

-  (void)context;

-

-  if (CFGetTypeID((CFStringRef)value) == CFStringGetTypeID() &&

-      CFStringGetCString((CFStringRef)value, valueStr, sizeof(valueStr),

-                         kCFStringEncodingUTF8))

-  {

-    snprintf(hostname, sizeof(hostname), "%s.%s", DNSSDHostName, valueStr);

-    if (!DNSSDAlias)

-      DNSSDAlias = cupsArrayNew(NULL, NULL);

-

-    cupsdAddAlias(DNSSDAlias, hostname);

-    cupsdLogMessage(CUPSD_LOG_DEBUG, "Added Back to My Mac ServerAlias %s",

-		    hostname);

-  }

-  else

-    cupsdLogMessage(CUPSD_LOG_ERROR,

-                    "Bad Back to My Mac domain in dynamic store!");

-}

-#  endif /* HAVE_COREFOUNDATION */

-

-

-/*

- * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info.

- */

-

-static char *				/* O - TXT record */

-dnssdBuildTxtRecord(

-    int             *txt_len,		/* O - TXT record length */

-    cupsd_printer_t *p,			/* I - Printer information */

-    int             for_lpd)		/* I - 1 = LPD, 0 = IPP */

-{

-  int		i;			/* Looping var */

-  char		adminurl_str[256],	/* URL for th admin page */

-		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 */

-

-

- /*

-  * 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;

-  if (for_lpd)

-    strlcpy(rp_str, p->name, sizeof(rp_str));

-  else

-    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 ? p->make_model : "Unknown";

-

-  httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str),

-                   "http", NULL, DNSSDHostName, DNSSDPort, "/%s/%s",

-		   (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers",

-		   p->name);

-  keyvalue[i  ][0] = "adminurl";

-  keyvalue[i++][1] = adminurl_str;

-

-  keyvalue[i  ][0] = "note";

-  keyvalue[i++][1] = p->location ? p->location : "";

-

-  keyvalue[i  ][0] = "priority";

-  keyvalue[i++][1] = for_lpd ? "100" : "0";

-

-  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";

-

-  keyvalue[i  ][0] = "Fax";

-  keyvalue[i++][1] = (p->type & CUPS_PRINTER_FAX) ? "T" : "F";

-

-  keyvalue[i  ][0] = "Color";

-  keyvalue[i++][1] = (p->type & CUPS_PRINTER_COLOR) ? "T" : "F";

-

-  keyvalue[i  ][0] = "Duplex";

-  keyvalue[i++][1] = (p->type & CUPS_PRINTER_DUPLEX) ? "T" : "F";

-

-  keyvalue[i  ][0] = "Staple";

-  keyvalue[i++][1] = (p->type & CUPS_PRINTER_STAPLE) ? "T" : "F";

-

-  keyvalue[i  ][0] = "Copies";

-  keyvalue[i++][1] = (p->type & CUPS_PRINTER_COPIES) ? "T" : "F";

-

-  keyvalue[i  ][0] = "Collate";

-  keyvalue[i++][1] = (p->type & CUPS_PRINTER_COLLATE) ? "T" : "F";

-

-  keyvalue[i  ][0] = "Punch";

-  keyvalue[i++][1] = (p->type & CUPS_PRINTER_PUNCH) ? "T" : "F";

-

-  keyvalue[i  ][0] = "Bind";

-  keyvalue[i++][1] = (p->type & CUPS_PRINTER_BIND) ? "T" : "F";

-

-  keyvalue[i  ][0] = "Sort";

-  keyvalue[i++][1] = (p->type & CUPS_PRINTER_SORT) ? "T" : "F";

-

-  keyvalue[i  ][0] = "Scan";

-  keyvalue[i++][1] = (p->type & CUPS_PRINTER_MFP) ? "T" : "F";

-

-  keyvalue[i  ][0] = "pdl";

-  keyvalue[i++][1] = p->pdl ? p->pdl : "application/postscript";

-

-  if (get_auth_info_required(p, air_str, sizeof(air_str)))

-  {

-    keyvalue[i  ][0] = "air";

-    keyvalue[i++][1] = air_str;

-  }

-

- /*

-  * Then pack them into a proper txt record...

-  */

-

-  return (dnssdPackTxtRecord(txt_len, keyvalue, i));

-}

-

-

+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)

 /*

  * 'dnssdComparePrinters()' - Compare the registered names of two printers.

  */

@@ -2464,7 +2405,16 @@ static int				/* O - Result of compariso

 dnssdComparePrinters(cupsd_printer_t *a,/* I - First printer */

                      cupsd_printer_t *b)/* I - Second printer */

 {

-  return (strcasecmp(a->reg_name, b->reg_name));

+  if (!a->reg_name)

+    if (!b->reg_name)

+      return 0;

+    else

+      return -1;

+  else 

+    if (!b->reg_name)

+      return 1;

+    else

+      return (strcasecmp(a->reg_name, b->reg_name));

 }

@@ -2479,6 +2429,10 @@ dnssdDeregisterPrinter(

 {

   cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name);

+#ifdef HAVE_DNSSD

+  if (!DNSSDRef)

+    return;

+

  /*

   * Closing the socket deregisters the service

   */

@@ -2514,6 +2468,23 @@ dnssdDeregisterPrinter(

     free(p->printer_txt);

     p->printer_txt = NULL;

   }

+#endif /* HAVE_DNSSD */

+#ifdef HAVE_AVAHI

+  if (p->avahi_group)

+  {

+    avahi_entry_group_reset (p->avahi_group);

+    avahi_entry_group_free (p->avahi_group);

+    p->avahi_group = NULL;

+

+    if (p->ipp_txt)

+      avahi_string_list_free (p->ipp_txt);

+

+    if (p->printer_txt)

+      avahi_string_list_free (p->printer_txt);

+

+    p->ipp_txt = p->printer_txt = NULL;

+  }

+#endif /* HAVE_AVAHI */

  /*

   * Remove the printer from the array of DNS-SD printers, then clear the

@@ -2526,136 +2497,47 @@ dnssdDeregisterPrinter(

 /*

- * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the

- *                          TXT record format.

+ * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer

+ *		              or update the broadcast contents.

  */

-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 */

+static void 

+dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */

 {

-  int  i;				/* Looping var */

-  int  length;				/* Length of TXT record */

-  int  length2;				/* Length of value */

-  char *txtRecord;			/* TXT record buffer */

-  char *cursor;				/* Looping pointer */

+#ifdef HAVE_DNSSD

+  DNSServiceErrorType	se;		/* dnssd errors */

+  char			*ipp_txt,	/* IPP TXT record buffer */

+			*printer_txt;	/* LPD TXT record buffer */

+  int			ipp_len,	/* IPP TXT record length */

+			printer_len;	/* LPD TXT record length */

+  char			name[1024];	/* Service name */

+#endif /* HAVE_DNSSD */

+#ifdef HAVE_AVAHI

+  int			ret;		/* Error code */

+  AvahiStringList	*ipp_txt,	/* IPP TXT record list */

+			*printer_txt;	/* LPD TXT record buffer */

+  char			name[AVAHI_LABEL_MAX];	/* Service name */

+#endif /* HAVE_AVAHI */

+  const char		*regtype;	/* Registration type */

+  char			*nameptr;	/* Pointer into name */

- /*

-  * Calculate the buffer size

-  */

+#ifdef HAVE_DNSSD

+  if (!DNSSDRef)

+    return;

-  if (count <= 0)

-    return (NULL);

+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,

+                  !p->ipp_ref ? "new" : "update");

-  for (length = i = 0; i < count; i++)

-    length += 1 + strlen(keyvalue[i][0]) + 

-	      (keyvalue[i][1] ? 1 + strlen(keyvalue[i][1]) : 0);

+#endif /* HAVE_DNSSD */

+#ifdef HAVE_AVAHI

+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,

+		  !p->avahi_group ? "new" : "update");

+#endif /* HAVE_AVAHI */

  /*

-  * Allocate and fill it

-  */

-

-  txtRecord = malloc(length);

-  if (txtRecord)

-  {

-    *txt_len = length;

-

-    for (cursor = txtRecord, i = 0; i < count; i++)

-    {

-     /*

-      * Drop in the p-string style length byte followed by the data

-      */

-

-      length  = strlen(keyvalue[i][0]);

-      length2 = keyvalue[i][1] ? 1 + strlen(keyvalue[i][1]) : 0;

-

-      *cursor++ = (unsigned char)(length + length2);

-

-      memcpy(cursor, keyvalue[i][0], length);

-      cursor += length;

-

-      if (length2)

-      {

-        length2 --;

-	*cursor++ = '=';

-	memcpy(cursor, keyvalue[i][1], length2);

-	cursor += length2;

-      }

-    }

-  }

-

-  return (txtRecord);

-}

-

-

-/*

- * 'dnssdRegisterCallback()' - DNSServiceRegister callback.

- */

-

-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 */

-{

-  cupsd_printer_t *p = (cupsd_printer_t *)context;

-					/* Current printer */

-

-

-  cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterCallback(%s, %s) for %s (%s)",

-                  name, regtype, p ? p->name : "Web Interface",

-		  p ? (p->reg_name ? p->reg_name : "(null)") : "NA");

-

-  if (errorCode)

-  {

-    cupsdLogMessage(CUPSD_LOG_ERROR, 

-		    "DNSServiceRegister failed with error %d", (int)errorCode);

-    return;

-  }

-  else if (p && (!p->reg_name || strcasecmp(name, p->reg_name)))

-  {

-    cupsdLogMessage(CUPSD_LOG_INFO, "Using service name \"%s\" for \"%s\"",

-                    name, p->name);

-

-    cupsArrayRemove(DNSSDPrinters, p);

-    cupsdSetString(&p->reg_name, name);

-    cupsArrayAdd(DNSSDPrinters, p);

-

-    LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED;

-  }

-}

-

-

-/*

- * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer

- *		              or update the broadcast contents.

- */

-

-static void 

-dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */

-{

-  DNSServiceErrorType	se;		/* dnssd errors */

-  char			*ipp_txt,	/* IPP TXT record buffer */

-			*printer_txt,	/* LPD TXT record buffer */

-			name[1024],	/* Service name */

-			*nameptr;	/* Pointer into name */

-  int			ipp_len,	/* IPP TXT record length */

-			printer_len;	/* LPD TXT record length */

-  const char		*regtype;	/* Registration type */

-

-

-  cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,

-                  !p->ipp_ref ? "new" : "update");

-

- /*

-  * If per-printer sharing was just disabled make sure we're not

-  * registered before returning.

+  * If per-printer sharing was just disabled make sure we're not

+  * registered before returning.

   */

   if (!p->shared)

@@ -2671,12 +2553,36 @@ dnssdRegisterPrinter(cupsd_printer_t *p)

   if (p->info && strlen(p->info) > 0)

   {

     if (DNSSDComputerName)

-      snprintf(name, sizeof(name), "%s @ %s", p->info, DNSSDComputerName);

+    {

+     /*

+      * Make sure there is room for at least 15 characters of