Merge changes from CUPS trunk, r7566.

[thirdparty/cups.git] / backend / network.c

diff --git a/backend/network.c b/backend/network.c
index 68d346f121c1f3ece4232831564b063bbf0c88d0..d83ea9ccfab341edec7523b15191079cb7d72dbd 100644 (file)
--- a/backend/network.c
+++ b/backend/network.c
@@ -197,12 +197,11 @@ backendResolveURI(char **argv)            /* I - Command-line arguments */
   * Resolve it as needed...
   */
 
-  if (strstr(resource, "._tcp") || strstr(hostname, "._tcp"))
+  if (strstr(hostname, "._tcp"))
   {
 #ifdef HAVE_DNSSD
     DNSServiceRef      ref;            /* DNS-SD service reference */
-    char               *full_name,     /* Full (service) name */
-                       *regtype,       /* Pointer to type in hostname */
+    char               *regtype,       /* Pointer to type in hostname */
                        *domain;        /* Pointer to domain in hostname */
     static char                resolved_uri[HTTP_MAX_URI];
                                        /* Resolved device URI */
@@ -211,12 +210,7 @@ backendResolveURI(char **argv)             /* I - Command-line arguments */
     * Separate the hostname into service name, registration type, and domain...
     */
 
-    if (strstr(resource, "._tcp"))
-      full_name = resource + 1;
-    else
-      full_name = hostname;
-
-    regtype = strchr(full_name, '.');
+    regtype = strchr(hostname, '.');
     *regtype++ = '\0';
 
     domain = regtype + strlen(regtype) - 1;
@@ -234,9 +228,9 @@ backendResolveURI(char **argv)              /* I - Command-line arguments */
 
     fprintf(stderr,
             "DEBUG: Resolving service \"%s\", regtype \"%s\", domain \"%s\"\n",
-           full_name, regtype, domain ? domain : "(null)");
+           hostname, regtype, domain ? domain : "(null)");
 
-    if (DNSServiceResolve(&ref, 0, 0, full_name, regtype, domain,
+    if (DNSServiceResolve(&ref, 0, 0, hostname, regtype, domain,
                          resolve_callback,
                          resolved_uri) == kDNSServiceErr_NoError)
     {