cups-browsed: Fixed preservation of location/description info on local queues

(cherry picked from commit ebc50cb99c42f5e105e2cc7bfb975b92e0307d00)

diff --git a/NEWS b/NEWS
index cac613ba3cc1f8931f52f88ffb66704c0c60175b..c044aa39bd148ff0f4f2c5889d7071339ff47972 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@ NEWS - OpenPrinting CUPS Filters v1.28.5 - 2020-10-13
 
 CHANGES IN V1.28.6
 
+       - cups-browsed: Removed unneeded IPP attribute additions
+         preventing the created local queues from preserving a
+         location or description the user assigns to them (Issue
+         #323).
        - cups-browsed: Removed all calls of the resolve_uri() function
          of libcupsfilters, as these are not actually needed and in case
          the supplied DNS-SD-based URI is not resolvable, the function

diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c
index 1100cacca5f342664c06d859f3baf6bb99d5a7f8..bffd1e09a98ef91de8fda5c3a86d73d12baa7752 100644 (file)
--- a/utils/cups-browsed.c
+++ b/utils/cups-browsed.c
@@ -8795,9 +8795,6 @@ gboolean update_cups_queues(gpointer unused) {
                    IPP_PRINTER_IDLE);
       /* ... and accepting jobs */
       ippAddBoolean(request, IPP_TAG_PRINTER, "printer-is-accepting-jobs", 1);
-      /* Location */
-      ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT,
-                  "printer-location", NULL, p->location);
       num_options = 0;
       options = NULL;
       /* Device URI: ipp(s)://<remote host>:631/printers/<remote queue>
@@ -8807,10 +8804,6 @@ gboolean update_cups_queues(gpointer unused) {
       /* Option cups-browsed=true, marking that we have created this queue */
       num_options = cupsAddOption(CUPS_BROWSED_MARK "-default", "true",
                                  num_options, &options);
-      /* Description */
-      num_options = cupsAddOption("printer-info", p->info,
-                                 num_options, &options);
-
       /* Default option settings from printer entry */
       for (i = 0; i < p->num_options; i ++)
        if (strcasecmp(p->options[i].name, "printer-is-shared"))