scheduler/ipp.c: Resolve possible mDNS uri (Fixes #340, #343)

Users sometimes pass URIs from dnssd and driverless backends as a
device URI for IPP Everywhere queues. These URIs have mDNS hostnames in
it, so they need to be resolved before used in connection.

diff --git a/CHANGES.md b/CHANGES.md
index 2f2bce0ea87c588a8b87d1146661885bfc547323..0aa4d904f3e79e4c41470fe5f9aeb67343bb511e 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,8 @@ Changes in CUPS v2.4.2 (TBA)
 ----------------------------
 
 - Fixed conditional jump based on uninitialized value in cups/ppd.c (Issue #329)
+- mDNS hostname in device uri is not resolved when installaling a permanent
+  IPP Everywhere queue (Issues #340, #343)
 
 
 Changes in CUPS v2.4.1 (27th January 2020)

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 4f307c255646a2a1cb14c66cfd67886fc4624a95..35d2a06aed679f2bb8decd0f9f2f64bf62e77a14 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -17,6 +17,7 @@
  */
 
 #include "cupsd.h"
+#include <cups/http-private.h>
 #include <cups/ppd-private.h>
 
 #ifdef __APPLE__
@@ -5271,6 +5272,7 @@ create_local_bg_thread(
                userpass[256],          /* User:pass */
                host[256],              /* Hostname */
                resource[1024],         /* Resource path */
+               uri[1024],              /* Resolved URI, unused */
                line[1024];             /* Line from PPD */
   int          port;                   /* Port number */
   http_encryption_t encryption;                /* Type of encryption to use */
@@ -5292,7 +5294,7 @@ create_local_bg_thread(
 
   cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: Generating PPD file from \"%s\"...", printer->name, printer->device_uri);
 
-  if (httpSeparateURI(HTTP_URI_CODING_ALL, printer->device_uri, scheme, sizeof(scheme), userpass, sizeof(userpass), host, sizeof(host), &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK)
+  if (httpSeparateURI(HTTP_URI_CODING_ALL, _httpResolveURI(printer->device_uri, uri, sizeof(uri), _HTTP_RESOLVE_DEFAULT, NULL, NULL), scheme, sizeof(scheme), userpass, sizeof(userpass), host, sizeof(host), &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK)
   {
     cupsdLogMessage(CUPSD_LOG_ERROR, "%s: Bad device URI \"%s\".", printer->name, printer->device_uri);
     return (NULL);