From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 19 Nov 2014 16:02:27 +0000 (+0000)
Subject: The scheduler incorrectly cleared the MakeModel string in the printers.conf file
X-Git-Tag: v2.2b1~436
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caff6dbab13b0a0e1bc87782e8d39237f7b6704c;p=thirdparty%2Fcups.git

The scheduler incorrectly cleared the MakeModel string in the printers.conf file
after a restart (<rdar://problem/16827518>)



git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12264 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt
index da44da732c..3099a990ea 100644
--- a/CHANGES-2.0.txt
+++ b/CHANGES-2.0.txt
@@ -5,6 +5,8 @@ CHANGES IN CUPS V2.0.2
 
 	- Command-line programs were not localized on Mac OS X
 	  (<rdar://problem/14546232>)
+	- The scheduler incorrectly cleared the MakeModel string in the
+	  printers.conf file after a restart (<rdar://problem/16827518>)
 
 
 CHANGES IN CUPS V2.0.1
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 8fad02df83..eea3633a61 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3685,8 +3685,6 @@ load_ppd(cupsd_printer_t *p)		/* I - Printer */
   _ppdCacheDestroy(p->pc);
   p->pc = NULL;
 
-  cupsdClearString(&(p->make_model));
-
   if (cache_info.st_mtime >= ppd_info.st_mtime)
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG, "load_ppd: Loading %s...", cache_name);
@@ -3710,6 +3708,8 @@ load_ppd(cupsd_printer_t *p)		/* I - Printer */
 
   cupsdLogMessage(CUPSD_LOG_DEBUG, "load_ppd: Loading %s...", ppd_name);
 
+  cupsdClearString(&(p->make_model));
+
   p->type &= (cups_ptype_t)~CUPS_PRINTER_OPTIONS;
   p->type |= CUPS_PRINTER_BW;