Bug#378904: --guess is wrongly documented

[Robert Millan]

Package: libmail-spf-query-perl
Severity: normal
Tags: patch

--guess is documented as if you could pass it a string to override the default
best-guess record (i.e. "a/24 mx/24 ptr"), but in fact you can't.  The
underliing code treats it as a boolean to enable best-guess mechanism iwht the
default fallback.

Currently, spfquery(1) will accept any string as parameter to --guess, with the
result being that the fallback is enabled.  Instead, it should treat --guess as
a boolean to enable best-guess, which is what the library is doing.

Patch attached.

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17-1-amd64-k8
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8)
-------------- next part --------------
diff -ur libmail-spf-query-perl-1.999.1.old/bin/spfquery libmail-spf-query-perl-1.999.1/bin/spfquery
--- libmail-spf-query-perl-1.999.1.old/bin/spfquery	2006-01-22 19:00:35.000000000 +0100
+++ libmail-spf-query-perl-1.999.1/bin/spfquery	2006-07-19 17:31:28.000000000 +0200
@@ -104,9 +104,9 @@
 Use the specified I<string> as the default explanation if the SPF record does
 not specify an explanation string itself.
 
-=item B<--guess> I<spf-terms>
+=item B<--guess>
 
-Use I<spf-terms> as a default record if no SPF record is found.  B<This is a
+Use 'v=spf1 a/24 mx/24 ptr ?all' as a default record if no SPF record is found.  B<This is a
 non-standard feature.>
 
 =item B<--keep-comments>
@@ -307,7 +307,7 @@
     --debug             Output debugging information.
     --default-explanation <string>
                         Default explanation string to use.
-    --guess <spf-terms> Default checks if no SPF record is found.
+    --guess             Use best-guess if no SPF record is found.
     --keep-comments     Print comments found when reading from a file.
     --local <spf-terms> Local policy for whitelisting.
     --max-lookup-count <n>
@@ -344,7 +344,7 @@
   'debug!',
   'local=s',
   'trusted!',
-  'guess=s',
+  'guess!',
   'default-explanation=s',
   'max-lookup-count|max-lookup=i',
   'sanitize!',