From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 30 Jun 2014 14:27:01 +0000 (+0000)
Subject: Fix the debug output from the DNS-SD backend when using Avahi (STR #4444)
X-Git-Tag: v2.2b1~590
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bde350ea9eba457485189db996b38dcb908524f9;p=thirdparty%2Fcups.git

Fix the debug output from the DNS-SD backend when using Avahi (STR #4444)

(Avahi doesn't include the trailing dot for the regtype value)


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11969 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index 76eabe97e1..4d06a687b5 100644
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -15,6 +15,8 @@ CHANGES IN CUPS V1.7.4
 	  localization (STR #4436)
 	- Fixed an "IPP read error" issue (STR #4440)
 	- Fixed the --disable-libusb configure option (STR #4439)
+	- Fixed the debug output from the DNS-SD backend when using Avahi
+	  (STR #4444)
 
 
 CHANGES IN CUPS V1.7.3
diff --git a/backend/dnssd.c b/backend/dnssd.c
index bac13b0002..5f0ec9e045 100644
--- a/backend/dnssd.c
+++ b/backend/dnssd.c
@@ -921,8 +921,12 @@ get_device(cups_array_t *devices,	/* I - Device array */
   * Yes, add the device...
   */
 
-  fprintf(stderr, "DEBUG: Found \"%s.%s%s\"...\n", serviceName, regtype,
-	  replyDomain);
+#ifdef HAVE_DNSSD
+  DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
+#else /* HAVE_AVAHI */
+  avahi_service_name_join(fullName, kDNSServiceMaxDomainName,
+			   serviceName, regtype, replyDomain);
+#endif /* HAVE_DNSSD */
 
   device           = calloc(sizeof(cups_device_t), 1);
   device->name     = strdup(serviceName);