Use </DefaultPrinter> and </DefaultClass> to close the default printer/class (STR...

[thirdparty/cups.git] / scheduler / classes.c

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 788d5a94403c822185822d73eb5b7008d421f510..12d6ae2eba28403f125ff966cdb1a4f9dfa224ee 100644 (file)
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -332,7 +332,7 @@ cupsdLoadAllClasses(void)
         cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of classes.conf.", linenum);
     }
-    else if (!_cups_strcasecmp(line, "</Class>"))
+    else if (!_cups_strcasecmp(line, "</Class>") || !_cups_strcasecmp(line, "</DefaultClass>"))
     {
       if (p != NULL)
       {
@@ -795,7 +795,10 @@ cupsdSaveAllClasses(void)
       cupsFilePutConf(fp, "Option", value);
     }
 
-    cupsFilePuts(fp, "</Class>\n");
+    if (pclass == DefaultPrinter)
+      cupsFilePuts(fp, "</DefaultClass>\n");
+    else
+      cupsFilePuts(fp, "</Class>\n");
   }
 
   cupsdCloseCreatedConfFile(fp, filename);