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

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

diff --git a/CHANGES.txt b/CHANGES.txt
index f55c9819a92146aab405c305ac4b4b60bd530649..7052120d99744db422a2ef64959884dbe9db0db5 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,4 +26,6 @@ CHANGES IN CUPS V2.0b1
        - Increased the default idle exit timeout to 60 seconds on OS X
          (<rdar://problem/16041820>)
        - Printer classes were not accessible on OS X
-         (<rdar://problem/16385643>)
\ No newline at end of file
+         (<rdar://problem/16385643>)
+       - The scheduler now uses </DefaultPrinter> to close the default printer
+         definition in printers.conf (STR #4153)

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);

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 4818c863de23ec01015cbabfc04340442c0540b9..81e9ce860722520e2df8c541cf800cf26f307e6b 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -885,7 +885,7 @@ cupsdLoadAllPrinters(void)
         cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
     }
-    else if (!_cups_strcasecmp(line, "</Printer>"))
+    else if (!_cups_strcasecmp(line, "</Printer>") || _cups_strcasecmp(line, "</DefaultPrinter>"))
     {
       if (p != NULL)
       {
@@ -1581,7 +1581,10 @@ cupsdSaveAllPrinters(void)
       cupsFilePrintf(fp, "Attribute marker-change-time %ld\n",
                      (long)printer->marker_time);
 
-    cupsFilePuts(fp, "</Printer>\n");
+    if (printer == DefaultPrinter)
+      cupsFilePuts(fp, "</DefaultPrinter>\n");
+    else
+      cupsFilePuts(fp, "</Printer>\n");
   }
 
   cupsdCloseCreatedConfFile(fp, filename);