From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Tue, 16 Jul 2019 14:43:58 +0000 (-0400)
Subject: Don't default printer-info, printer-location, printer-geo-location (Issue #5603)
X-Git-Tag: v2.2.12~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2062d366eaba73174cf93361c262c69ea035b1e4;p=thirdparty%2Fcups.git

Don't default printer-info, printer-location, printer-geo-location (Issue #5603)
---

diff --git a/CHANGES.md b/CHANGES.md
index 163a87b58c..2e677a5bc2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,8 @@ Changes in CUPS v2.2.12
 - Fixed some compatibility issues with old releases of CUPS (Issue #5587)
 - Fixed a bug in the scheduler job cleanup code (Issue #5588)
 - "make" failed with GZIP options (Issue #5595)
+- The scheduler no longer provides a default value for the description
+  (Issue #5603)
 - The `lpadmin` command did not always update the PPD file for changes to the
   `cupsIPPSupplies` and `cupsSNMPSupplies` keywords (Issue #5610)
 - The scheduler now uses both the group's membership list as well as the
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 0589e6d7a1..937d0f3c9d 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1021,8 +1021,7 @@ cupsdLoadAllPrinters(void)
     }
     else if (!_cups_strcasecmp(line, "Info"))
     {
-      if (value)
-	cupsdSetString(&p->info, value);
+      cupsdSetString(&p->info, value ? value : "");
     }
     else if (!_cups_strcasecmp(line, "MakeModel"))
     {
@@ -1031,23 +1030,19 @@ cupsdLoadAllPrinters(void)
     }
     else if (!_cups_strcasecmp(line, "Location"))
     {
-      if (value)
-	cupsdSetString(&p->location, value);
+      cupsdSetString(&p->location, value ? value : "");
     }
     else if (!_cups_strcasecmp(line, "GeoLocation"))
     {
-      if (value)
-        cupsdSetString(&p->geo_location, value);
+      cupsdSetString(&p->geo_location, value ? value : "");
     }
     else if (!_cups_strcasecmp(line, "Organization"))
     {
-      if (value)
-	cupsdSetString(&p->organization, value);
+      cupsdSetString(&p->organization, value ? value : "");
     }
     else if (!_cups_strcasecmp(line, "OrganizationalUnit"))
     {
-      if (value)
-	cupsdSetString(&p->organizational_unit, value);
+      cupsdSetString(&p->organizational_unit, value ? value : "");
     }
     else if (!_cups_strcasecmp(line, "DeviceURI"))
     {