cups-browsed: When checking for already present print queues, take into account that with the naming scheme "MakeModel" also remote CUPS queues from the same server can get clustered together.
@@ -5056,7 +5056,9 @@ examine_discovered_printer_record(const char *host,
(p->host[0] == '\0' ||
p->status == STATUS_UNCONFIRMED ||
p->status == STATUS_DISAPPEARED ||
- (!strcasecmp(p->host, remote_host) && p->port == port)))
+ (!strcasecmp(p->host, remote_host) && p->port == port &&
+ strlen(p->uri) - strlen(resource) > 0 &&
+ !strcasecmp(p->uri + strlen(p->uri) - strlen(resource), resource))))
break;
/* Is there a local queue with the same URI as the remote queue? */
