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 8341e983ff447d4ca870d1c1510f3cb1bb6cb60b..580b60c5fb9d2c97f3a48a2d44371d88c13784f9 100644 (file)
--- 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 f4eac5c72ae68548c9e0a7b58bd843d3c04bba23..73e1fba0d71c699d6ac664e04f28805b3f2b5f9a 100644 (file)
--- 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);