HostNameLookups values documentation and interpretation skew

[michaelrsweet]

Version: 1.3.7
CUPS.org User: martin.pitt.canonical

From http://bugs.debian.org/379014:

"According to cupsd.conf(5), the HostNameLookups option takes
Yes or No as values; these should be On or Off (using Yes or
No results in an "unknown value" error in /var/log/cups/error.log"

[michaelrsweet]

CUPS.org User: martin.pitt.canonical

This patch keeps backwards compatibility, and makes it compatible with the documentation (Yes/No). I also added true/false, since they are accepted for other boolean options, too.

[michaelrsweet]

CUPS.org User: mike

Fixed in Subversion repository.

[michaelrsweet]

"str2861.patch":

Index: man/cupsd.conf.man.in

--- man/cupsd.conf.man.in (revision 7643)
+++ man/cupsd.conf.man.in (working copy)
@@ -12,7 +12,7 @@
." which should have been included with this file. If this file is
." file is missing or damaged, see the license at "http://www.cups.org/".
."
-.TH cupsd.conf 5 "Common UNIX Printing System" "15 May 2008" "Apple Inc."
+.TH cupsd.conf 5 "Common UNIX Printing System" "16 June 2008" "Apple Inc."
.SH NAME
cupsd.conf - server configuration file for cups
.SH DESCRIPTION
@@ -306,9 +306,9 @@
.br
Specifies whether to hide members of implicit classes.
.TP 5
-HostNameLookups Yes
+HostNameLookups On
.TP 5
-HostNameLookups No
+HostNameLookups Off
.TP 5
HostNameLookups Double
.br

Index: scheduler/conf.c

--- scheduler/conf.c (revision 7643)
+++ scheduler/conf.c (working copy)
@@ -2868,9 +2868,11 @@
* 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;