Merge changes from CUPS trunk, r6758.

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

diff --git a/scheduler/conf.c b/scheduler/conf.c
index d9627399855685928502b6fa355d29e0b8b9c684..121f8ef5df4ffa9e0b53aef547161bb90fe18ed6 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.c 6689 2007-07-18 23:52:15Z mike $"
+ * "$Id: conf.c 6746 2007-07-30 16:47:10Z mike $"
  *
  *   Configuration routines for the Common UNIX Printing System (CUPS).
  *
@@ -2723,7 +2723,9 @@ read_configuration(cups_file_t *fp)       /* I - File to read from */
       * DefaultAuthType {basic,digest,basicdigest,negotiate}
       */
 
-      if (!strcasecmp(value, "basic"))
+      if (!strcasecmp(value, "none"))
+       DefaultAuthType = AUTH_NONE;
+      else if (!strcasecmp(value, "basic"))
        DefaultAuthType = AUTH_BASIC;
       else if (!strcasecmp(value, "digest"))
        DefaultAuthType = AUTH_DIGEST;
@@ -3335,5 +3337,5 @@ read_policy(cups_file_t *fp,              /* I - Configuration file */
 
 
 /*
- * End of "$Id: conf.c 6689 2007-07-18 23:52:15Z mike $".
+ * End of "$Id: conf.c 6746 2007-07-30 16:47:10Z mike $".
  */