Fix for netatalk example in SAMs.

Set boolean options to =true or =false.

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 0985f85fe92e94b7cebb5021ea9e6bd665c4234b..33bf302c0c157386f030e95ee632803ad1b6e717 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -79,6 +79,8 @@ CHANGES IN CUPS V1.1.7
        - The scheduler enforced a 30 second timeout on all
          clients regardless of the Timeout directive and if a
          CGI was currently running.
+       - cupsParseOptions() now sets boolean options to
+         option=true or option=false.
 
 
 CHANGES IN CUPS V1.1.6-3

diff --git a/cups/options.c b/cups/options.c
index 2e16283ac9f900559ffb292b93d9e3dd1c20ab34..5394aacbfd4760bac06516cc93c3c144dbb78134 100644 (file)
--- a/cups/options.c
+++ b/cups/options.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: options.c,v 1.19 2001/02/09 16:23:35 mike Exp $"
+ * "$Id: options.c,v 1.20 2001/03/07 16:54:20 mike Exp $"
  *
  *   Option routines for the Common UNIX Printing System (CUPS).
  *
@@ -476,7 +476,12 @@ cupsParseOptions(const char    *arg,               /* I - Argument to parse */
       * Start of another option...
       */
 
-      num_options = cupsAddOption(name, "", num_options, options);
+      if (strncasecmp(name, "no", 2) == 0)
+        num_options = cupsAddOption(name + 2, "false", num_options,
+                                   options);
+      else
+        num_options = cupsAddOption(name, "true", num_options, options);
+
       continue;
     }
 
@@ -672,5 +677,5 @@ cupsMarkOptions(ppd_file_t    *ppd,         /* I - PPD file */
 
 
 /*
- * End of "$Id: options.c,v 1.19 2001/02/09 16:23:35 mike Exp $".
+ * End of "$Id: options.c,v 1.20 2001/03/07 16:54:20 mike Exp $".
  */

diff --git a/doc/sam.shtml b/doc/sam.shtml
index d94b82c3ce9d52d82b98156641515980dd06443b..3c9657d5c1c0561c06b1da5a898e29ae9837fb02 100644 (file)
--- a/doc/sam.shtml
+++ b/doc/sam.shtml
@@ -3207,7 +3207,7 @@ would look like:
 Printer Description:MyPrinter@MyServer:\
         :pr=|/usr/bin/lp -d MyPrinter:\
         :op=daemon:\
-        :pd=/etc/cups/ppd/MyPrinter.ppd
+        :pd=/etc/cups/ppd/MyPrinter.ppd:
 </PRE></UL>
 
 <!-- NEED 2in -->