From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 19 Feb 2014 19:21:18 +0000 (+0000)
Subject: The scheduler did not always update the MakeModel value in printers.conf after
X-Git-Tag: v2.2b1~746
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2644cfc5f2a7fc10bd1ed2aa52387b15f77db1db;p=thirdparty%2Fcups.git

The scheduler did not always update the MakeModel value in printers.conf after
updating the driver (STR #4264)



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

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index 8341e983ff..580b60c5fb 100644
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -3,6 +3,8 @@ CHANGES-1.7.txt
 
 CHANGES IN CUPS V1.7.2
 
+	- The scheduler did not always update the MakeModel value in
+	  printers.conf after updating the driver (STR #4264)
 	- The LPD mini daemon did not support print jobs larger than 2GB
 	  (STR #4351)
 	- Fixed a bug in the status reading code when sending a compressed data
diff --git a/scheduler/printers.c b/scheduler/printers.c
index f4eac5c72a..73e1fba0d7 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3685,6 +3685,8 @@ 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);