Don't stop reading printer config files on syntax errors.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@7966 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 822f985f77b16b70c72bab07c68d49a2bca4cd97..2886782a785d9096dce55df3b55261953e218abb 100644 (file)
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -372,11 +372,8 @@ cupsdLoadAllClasses(void)
          DefaultPrinter = p;
       }
       else
-      {
         cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of classes.conf.", linenum);
-        break;
-      }
     }
     else if (!strcasecmp(line, "</Class>"))
     {
@@ -386,17 +383,13 @@ cupsdLoadAllClasses(void)
         p = NULL;
       }
       else
-      {
         cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of classes.conf.", linenum);
-        break;
-      }
     }
     else if (!p)
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
                       "Syntax error on line %d of classes.conf.", linenum);
-      break;
     }
     else if (!strcasecmp(line, "AuthInfoRequired"))
     {
@@ -437,11 +430,8 @@ cupsdLoadAllClasses(void)
     else if (!strcasecmp(line, "Printer"))
     {
       if (!value)
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of classes.conf.", linenum);
-       break;
-      }
       else if ((temp = cupsdFindPrinter(value)) == NULL)
       {
        cupsdLogMessage(CUPSD_LOG_WARN,
@@ -482,12 +472,9 @@ cupsdLoadAllClasses(void)
       else if (!strcasecmp(value, "stopped"))
         p->state = IPP_PRINTER_STOPPED;
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of classes.conf.",
                        linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "StateMessage"))
     {
@@ -524,12 +511,9 @@ cupsdLoadAllClasses(void)
                !strcasecmp(value, "false")))
         p->accepting = 0;
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of classes.conf.",
                        linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "Shared"))
     {
@@ -548,12 +532,9 @@ cupsdLoadAllClasses(void)
                !strcasecmp(value, "false")))
         p->shared = 0;
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of classes.conf.",
                        linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "JobSheets"))
     {
@@ -588,11 +569,8 @@ cupsdLoadAllClasses(void)
        }
       }
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of classes.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "AllowUser"))
     {
@@ -602,11 +580,8 @@ cupsdLoadAllClasses(void)
         cupsdAddPrinterUser(p, value);
       }
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of classes.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "DenyUser"))
     {
@@ -616,44 +591,32 @@ cupsdLoadAllClasses(void)
         cupsdAddPrinterUser(p, value);
       }
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of classes.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "QuotaPeriod"))
     {
       if (value)
         p->quota_period = atoi(value);
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of classes.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "PageLimit"))
     {
       if (value)
         p->page_limit = atoi(value);
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of classes.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "KLimit"))
     {
       if (value)
         p->k_limit = atoi(value);
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of classes.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "OpPolicy"))
     {
@@ -673,22 +636,16 @@ cupsdLoadAllClasses(void)
                          value, linenum);
       }
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of classes.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "ErrorPolicy"))
     {
       if (value)
         cupsdSetString(&p->error_policy, value);
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of classes.conf.", linenum);
-       break;
-      }
     }
     else
     {

diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index 1c08025a1d7ad9812956449d0dcf84fb59a6ac08..3b6c4ba5d7e74ca20d84bff7fe12534670f9d174 100644 (file)
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -436,17 +436,13 @@ cupsdLoadRemoteCache(void)
         p = NULL;
       }
       else
-      {
         cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of remote.cache.", linenum);
-        break;
-      }
     }
     else if (!p)
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
                       "Syntax error on line %d of remote.cache.", linenum);
-      break;
     }
     else if (!strcasecmp(line, "Info"))
     {
@@ -476,11 +472,8 @@ cupsdLoadRemoteCache(void)
        cupsdSetDeviceURI(p, value);
       }
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of remote.cache.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "Option") && value)
     {
@@ -512,11 +505,8 @@ cupsdLoadRemoteCache(void)
       else if (value && !strcasecmp(value, "stopped"))
         p->state = IPP_PRINTER_STOPPED;
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of remote.cache.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "StateMessage"))
     {
@@ -544,22 +534,16 @@ cupsdLoadRemoteCache(void)
                !strcasecmp(value, "false")))
         p->accepting = 0;
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of remote.cache.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "Type"))
     {
       if (value)
         p->type = atoi(value);
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of remote.cache.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "BrowseTime"))
     {
@@ -571,11 +555,8 @@ cupsdLoadRemoteCache(void)
           p->browse_expire = t;
       }
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of remote.cache.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "JobSheets"))
     {
@@ -606,11 +587,8 @@ cupsdLoadRemoteCache(void)
        }
       }
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of remote.cache.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "AllowUser"))
     {
@@ -620,11 +598,8 @@ cupsdLoadRemoteCache(void)
         cupsdAddPrinterUser(p, value);
       }
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of remote.cache.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "DenyUser"))
     {
@@ -634,11 +609,8 @@ cupsdLoadRemoteCache(void)
         cupsdAddPrinterUser(p, value);
       }
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of remote.cache.", linenum);
-       break;
-      }
     }
     else
     {

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 8e2b9f754b8569b12b56b3bc351374b7c7c25b5b..ea2531ca6d71eba8e0e5a295814f85e5b4abf36e 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -919,11 +919,8 @@ cupsdLoadAllPrinters(void)
          DefaultPrinter = p;
       }
       else
-      {
         cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "</Printer>"))
     {
@@ -964,17 +961,13 @@ cupsdLoadAllPrinters(void)
         p = NULL;
       }
       else
-      {
         cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
-       break;
-      }
     }
     else if (!p)
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
                       "Syntax error on line %d of printers.conf.", linenum);
-      break;
     }
     else if (!strcasecmp(line, "AuthInfoRequired"))
     {
@@ -998,11 +991,8 @@ cupsdLoadAllPrinters(void)
       if (value)
        cupsdSetDeviceURI(p, value);
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "Option") && value)
     {
@@ -1030,11 +1020,8 @@ cupsdLoadAllPrinters(void)
       else if (value)
         cupsdClearString(&p->port_monitor);
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "State"))
     {
@@ -1047,11 +1034,8 @@ cupsdLoadAllPrinters(void)
       else if (value && !strcasecmp(value, "stopped"))
         p->state = IPP_PRINTER_STOPPED;
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "StateMessage"))
     {
@@ -1088,11 +1072,8 @@ cupsdLoadAllPrinters(void)
                !strcasecmp(value, "false")))
         p->accepting = 0;
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "Shared"))
     {
@@ -1111,11 +1092,8 @@ cupsdLoadAllPrinters(void)
                !strcasecmp(value, "false")))
         p->shared = 0;
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "JobSheets"))
     {
@@ -1146,11 +1124,8 @@ cupsdLoadAllPrinters(void)
        }
       }
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "AllowUser"))
     {
@@ -1160,11 +1135,8 @@ cupsdLoadAllPrinters(void)
         cupsdAddPrinterUser(p, value);
       }
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "DenyUser"))
     {
@@ -1174,44 +1146,32 @@ cupsdLoadAllPrinters(void)
         cupsdAddPrinterUser(p, value);
       }
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "QuotaPeriod"))
     {
       if (value)
         p->quota_period = atoi(value);
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "PageLimit"))
     {
       if (value)
         p->page_limit = atoi(value);
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "KLimit"))
     {
       if (value)
         p->k_limit = atoi(value);
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "OpPolicy"))
     {
@@ -1231,22 +1191,16 @@ cupsdLoadAllPrinters(void)
                          value, linenum);
       }
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "ErrorPolicy"))
     {
       if (value)
         cupsdSetString(&p->error_policy, value);
       else
-      {
        cupsdLogMessage(CUPSD_LOG_ERROR,
                        "Syntax error on line %d of printers.conf.", linenum);
-       break;
-      }
     }
     else if (!strcasecmp(line, "Attribute") && value)
     {