Merge changes from CUPS 1.4svn-r7670.

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

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 20a5edd66f30c24c18b912416476d08d8b37a877..c9eb950fad27d6b98d226ee4d2cf5a42b6a89141 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -346,6 +346,7 @@ cupsdReadConfiguration(void)
   cups_file_t  *fp;                    /* Configuration file */
   int          status;                 /* Return status */
   char         temp[1024],             /* Temporary buffer */
+               mimedir[1024],          /* MIME directory */
                *slash;                 /* Directory separator */
   cups_lang_t  *language;              /* Language */
   struct passwd        *user;                  /* Default user */
@@ -1113,6 +1114,7 @@ cupsdReadConfiguration(void)
     */
 
     snprintf(temp, sizeof(temp), "%s/filter", ServerBin);
+    snprintf(mimedir, sizeof(mimedir), "%s/mime", DataDir);
 
     MimeDatabase = mimeLoad(ServerRoot, temp);
 
@@ -1123,6 +1125,9 @@ cupsdReadConfiguration(void)
       exit(errno);
     }
 
+    if (!access(mimedir, 0))
+      MimeDatabase = mimeMerge(MimeDatabase, mimedir, temp);
+
     cupsdLogMessage(CUPSD_LOG_INFO,
                     "Loaded MIME database from \'%s\': %d types, %d filters...",
                     ServerRoot, mimeNumTypes(MimeDatabase),
@@ -2868,9 +2873,11 @@ read_configuration(cups_file_t *fp)      /* I - File to read from */
       * Do hostname lookups?
       */
 
-      if (!strcasecmp(value, "off"))
+      if (!strcasecmp(value, "off") || !strcasecmp(value, "no") ||
+          !strcasecmp(value, "false"))
         HostNameLookups = 0;
-      else if (!strcasecmp(value, "on"))
+      else if (!strcasecmp(value, "on") || !strcasecmp(value, "yes") ||
+          !strcasecmp(value, "true"))
         HostNameLookups = 1;
       else if (!strcasecmp(value, "double"))
         HostNameLookups = 2;