INN commit: branches/2.4 (control/pgpverify.in doc/man/pgpverify.1)

INN Commit Russ_Allbery at isc.org
Sun Apr 6 09:42:16 UTC 2008


    Date: Sunday, April 6, 2008 @ 02:42:16
  Author: iulius
Revision: 7740

Typos.

Modified:
  branches/2.4/control/pgpverify.in
  branches/2.4/doc/man/pgpverify.1

----------------------+
 control/pgpverify.in |  128 ++++++++++++++++++++++++-------------------------
 doc/man/pgpverify.1  |   30 +++++------
 2 files changed, 79 insertions(+), 79 deletions(-)

Modified: control/pgpverify.in
===================================================================
--- control/pgpverify.in	2008-04-06 09:38:31 UTC (rev 7739)
+++ control/pgpverify.in	2008-04-06 09:42:16 UTC (rev 7740)
@@ -2,7 +2,7 @@
 # do '@LIBDIR@/innshellvars.pl';
 # If running inside INN, uncomment the above and point to innshellvars.pl.
 #
-# Written April 1996, tale at isc.org (David C Lawrence)
+# Written April 1996, <tale at isc.org> (David C Lawrence)
 # Currently maintained by Russ Allbery <rra at stanford.edu>
 # Version 1.27, 2005-07-02
 #
@@ -35,7 +35,7 @@
 # -- Bump version number to match CVS revision number.
 # -- Replaced all signature verification code with code that uses detached
 #    signatures.  Signatures generated by GnuPG couldn't be verified using
-#    attached signatures without adding a Hash header, and this was the
+#    attached signatures without adding a Hash: header, and this was the
 #    path of least resistance plus avoids munging problems in the future.
 #    Code taken from PGP::Sign.
 #
@@ -61,61 +61,61 @@
 # -- Use INN's syslog_facility if available.
 #
 # Changes from 1.11 -> 1.12
-# -- support for GnuPG
+# -- Support for GnuPG.
 # -- Use /usr/ucb/logger, if present, instead of /usr/bin/logger (the latter
 #    of which, on Solaris at least, is some sort of brain damaged POSIX.2
 #    command which doesn't use syslog).
-# -- made syslog work for dec_osf (version 4, at least)
-# -- fixed up priority of '.' operator vs bitwise operators
+# -- Made syslog work for dec_osf (version 4, at least).
+# -- Fixed up priority of '.' operator vs bitwise operators.
 #
 # Changes from 1.10 -> 1.11
-# -- code to log error messages to syslog.
+# -- Code to log error messages to syslog.
 #    See $syslog and $syslog_method configurable variables.
-# -- configurably allow date stamp on stderr error messages.
-# -- added locking for multiple concurrent pgp instances.
-# -- more clear error message if pgp exits abnormally.
-# -- identify PGP 5 "BAD signature" string.
-# -- minor diddling for INN (path to innshellvars.pl changed)
+# -- Configurably allow date stamp on stderr error messages.
+# -- Added locking for multiple concurrent pgp instances.
+# -- More clear error message if pgp exits abnormally.
+# -- Identify PGP 5 "BAD signature" string.
+# -- Minor diddling for INN (path to innshellvars.pl changed).
 #
 # Changes from 1.9 -> 1.10
-# -- minor diddling for INN 2.0: use $inn'pathtmp if it exists, and
-#    work with the new subst method to find innshellvars.pl
-# -- do not truncate the tmp file when opening, in case it is really
-#    linked to another file
+# -- Minor diddling for INN 2.0:  use $inn'pathtmp if it exists, and
+#    work with the new subst method to find innshellvars.pl.
+# -- Do not truncate the tmp file when opening, in case it is really
+#    linked to another file.
 #
 # Changes from 1.8 -> 1.9
-# -- match 'Bad signature' pgp output to return exit status 3 by removing
+# -- Match 'Bad signature' pgp output to return exit status 3 by removing
 #    '^' in regexp matched on multiline string.
 #
 # Changes from 1.7 -> 1.8
-# -- ignore final dot-CRLF if article is in NNTP format
+# -- Ignore final dot-CRLF if article is in NNTP format.
 #
 # Changes from 1.6 -> 1.7
-# -- parse PGP 5.0 'good signature' lines.
-# -- allow -test swtich; prints pgp input and output
-# -- look for pgp in INN's innshellvars.pl
-# -- changed regexp delimiters for stripping $0 to be compatible with old
-#    perl
+# -- Parse PGP 5.0 'good signature' lines.
+# -- Allow -test switch; prints pgp input and output.
+# -- Look for pgp in INN's innshellvars.pl.
+# -- Changed regexp delimiters for stripping $0 to be compatible with old
+#    Perl.
 #
 # Changes from 1.5 -> 1.6
-# -- handle articles encoded in NNTP format ('.' starting line is doubled,
+# -- Handle articles encoded in NNTP format ('.' starting line is doubled,
 #    \r\n at line end) by stripping NNTP encoding.
-# -- exit 255 with pointer to $HOME or $PGPPATH if pgp can't find key
-#    ring.  (probably doesn't match the necessary error message with
-#    ViaCrypt PGP)
-# -- failures also report message-id so the article can be looked up to
+# -- Exit 255 with pointer to $HOME or $PGPPATH if pgp can't find key
+#    ring.  (It probably doesn't match the necessary error message with
+#    ViaCrypt PGP.)
+# -- Failures also report Message-ID so the article can be looked up to
 #    retry.
 #
 # Changes from 1.4 -> 1.5
-# -- force English lanugage for 'Good signature from user' by passing
+# -- Force English language for 'Good signature from user' by passing
 #    +language=en on pgp command line, rather than setting the
 #    environment variable LANGUAGE to 'en'.
 #
 # Changes from 1.3 -> 1.4
-# -- now handles wrapped headers that have been unfolded.
-#    (though I do believe news software oughtn't be unfolding them.)
-# -- checks to ensure that the temporary file is really a file, and
-#    not a link or some other weirdness
+# -- Now handles wrapped headers that have been unfolded.
+#    (Though I do believe news software oughtn't be unfolding them.)
+# -- Checks to ensure that the temporary file is really a file, and
+#    not a link or some other weirdness.
 
 # Path to the GnuPG gpgv binary, if you have GnuPG.  If you do, this will
 # be used in preference to PGP.  For most current control messages, you
@@ -152,7 +152,7 @@
 # all that's available up to version 5.004_03.  If your syslog does not
 # accept UDP log packets, such as when syslogd runs with the -l flag,
 # 'inet' will not work.  A value of 'unix' will try to contact syslogd
-# directly over a Unix domain socket built entirely in perl code (no
+# directly over a Unix domain socket built entirely in Perl code (no
 # subprocesses).  If that is not working for you, and you have the
 # 'logger' program on your system, set this variable to its full path name
 # to have a subprocess contact syslogd.  If the method is just "logger",
@@ -163,10 +163,10 @@
 # /some/text/file" on a file that is not a valid news article.  The
 # "non-header at line #" error should be syslogged.
 #
-# $syslog_method = 'unix';    # Unix doman socket, perl5.004_03 or higher
-# $syslog_method = 'inet';    # UDP to port 514 of localhost
+# $syslog_method = 'unix';    # Unix doman socket, Perl 5.004_03 or higher.
+# $syslog_method = 'inet';    # UDP to port 514 of localhost.
 # $syslog_method = '';        # Don't ever try to do syslogging.
-$syslog_method = 'logger';    # search for the logger program
+$syslog_method = 'logger';    # Search for the logger program.
 
 # The next two variables are the values to be used for syslog's facility
 # and level to use, as would be found in syslog.conf.  For various
@@ -181,9 +181,9 @@
 # Prepend the error message with a timestamp?  This is only relevant if
 # not syslogging, when errors go to stderr.
 #
-# $log_date = 0;  # zero means don't do it.
-# $log_date = 1;  # non-zero means do it.
-$log_date = -t STDOUT; # do it if STDOUT is to a terminal
+# $log_date = 0;  # Zero means don't do it.
+# $log_date = 1;  # Non-zero means do it.
+$log_date = -t STDOUT; # Do it if STDOUT is to a terminal.
 
 # End of configuration section.
 
@@ -310,12 +310,12 @@
 
   # The $sep value means the separator between the radix64 signature lines
   # can have any amount of spaces or tabs, but must have at least one
-  # space or tab, if there is a newline then the space or tab has to
+  # space or tab; if there is a newline then the space or tab has to
   # follow the newline.  Any number of newlines can appear as long as each
   # is followed by at least one space or tab.  *phew*
   my $sep = "[ \t]*(\n?[ \t]+)+";
 
-  # Match all of the characters in a radix64 string
+  # Match all of the characters in a radix64 string.
   my $r64 = '[a-zA-Z0-9+/]';
 
   local $_ = $$header{'X-PGP-Sig'};
@@ -341,27 +341,27 @@
     if ($nntp_format) {
       # Check for end of article; some news servers (eg, Highwind's
       # "Breeze") include the dot-CRLF of the NNTP protocol in the article
-      # data passed to this script
+      # data passed to this script.
       last if $_ eq ".\r\n";
 
-      # Remove NNTP encoding
+      # Remove NNTP encoding.
       s/^\.\./\./;
       s/\r\n$/\n/;
     }
     $message .= $_;
   }
 
-  # Strip off all trailing whitespace for compatibility with the way that
+  # Strip off all trailing whitespaces for compatibility with the way that
   # pgpverify used to work, using attached signatures.
   $message =~ s/[ \t]+\n/\n/g;
 
   return ($message, $signature, $version);
 }
 
-# Check a detatched signature for given data.  Takes a signature block (in
+# Check a detached signature for given data.  Takes a signature block (in
 # the form of an ASCII-armored string with embedded newlines), a version
 # number (which may be undef), and the message.  We return an exit status
-# and the key id if the signature verified.  0 means good signature, 1
+# and the key id if the signature is verified.  0 means good signature, 1
 # means bad data, 2 means an unknown signer, and 3 means a bad signature.
 # In the event of an error, we report with errmsg.
 #
@@ -558,7 +558,7 @@
   }
 
   if ($@ || $syslog_method eq '') {
-    warn $date, "$0: trying to use perl's syslog: $@\n" if $@;
+    warn $date, "$0: trying to use Perl's syslog: $@\n" if $@;
     warn $date, $message, "\n";
     warn $date, "... while processing $messageid\n"
       if $messageid;
@@ -580,7 +580,7 @@
       }
 
     } else {
-      # setlogsock arrived in perl 5.004_03 to enable Sys::Syslog to use a
+      # setlogsock arrived in Perl 5.004_03 to enable Sys::Syslog to use a
       # Unix domain socket to talk to syslogd, which is the only way to do
       # it when syslog runs with the -l switch.
       if ($syslog_method eq "unix") {
@@ -629,7 +629,7 @@
 
   $ltmp = ($file =~ m%(.*/)%)[0] . "shlock$$";
 
-  # this should really attempt to use another temp name
+  # This should really attempt to use another temp name.
   -e $ltmp && (unlink($ltmp) || return -1);
 
   open(LTMP, ">$ltmp") || return -1;
@@ -645,30 +645,30 @@
           return 0;
         }
 
-        # ok, the pid in the lockfile is not a number or no longer exists.
+        # OK, the pid in the lockfile is not a number or no longer exists.
         close(LOCK);            # silent failure is ok here
 
-        # unlink failed
+        # Unlink failed.
         if (unlink($file) != 1 && $! != &ENOENT) {
           unlink($ltmp);
           return 0;
         }
 
-      # check if open failed for reason other than file no longer present
+      # Check if open failed for reason other than file no longer present.
       } elsif ($! != &ENOENT) {
         unlink($ltmp);
         return -1;
       }
 
-      # either this process unlinked the lockfile because it was bogus, or
+      # Either this process unlinked the lockfile because it was bogus, or
       # between this process's link() and open() the other process holding
-      # the lock unlinked it.  This process can now try to aquire.
+      # the lock unlinked it.  This process can now try to acquire.
       if (! link($ltmp, $file)) {
         unlink($ltmp);
-        return $! == &EEXIST ? 0 : -1; # maybe another proc grabbed the lock
+        return $! == &EEXIST ? 0 : -1; # Maybe another proc grabbed the lock.
       }
 
-    } else {                    # first attempt to link failed
+    } else {                    # First attempt to link failed.
       unlink($ltmp);
       return 0;
     }
@@ -728,7 +728,7 @@
 
 B<pgpverify> may exit with the following statuses:
 
-=over 5
+=over 4
 
 =item 0Z<>
 
@@ -768,21 +768,21 @@
 servers to automatically honor Usenet control messages based on the
 originator of the control messages and the hierarchies for which the
 control messages applied.  For example, in the past, David Lawrence always
-issued control messages for the "Big 8" hierarchies (comp, humanities,
+issued control messages for the S<"Big 8"> hierarchies (comp, humanities,
 misc, news, rec, sci, soc, talk).  Usenet news administrators would
 configure their news server software to automatically honor newgroup and
 rmgroup control messages that originated from David Lawrence and applied
-to any of the Big 8 hierarchies.
+to any of the S<Big 8> hierarchies.
 
 Unfortunately, Usenet news articles (including control messages) are
 notoriously easy to forge.  Soon, malicious users realized they could
-create or remove (at least temporarily) any Big 8 newsgroup they wanted by
+create or remove (at least temporarily) any S<Big 8> newsgroup they wanted by
 simply forging an appropriate control message in David Lawrence's name.
 As Usenet became more widely used, forgeries became more common.
 
 The B<pgpverify> program was designed to allow Usenet news administrators
 to configure their servers to cryptographically verify control messages
-before automatically acting on them.  Under the pgpverify system, a Usenet
+before automatically acting on them.  Under the B<pgpverify> system, a Usenet
 hierarchy maintainer creates a PGP public/private key pair and
 disseminates the public key.  Whenever the hierarchy maintainer issues a
 control message, he uses the B<signcontrol> program to sign the control
@@ -790,7 +790,7 @@
 their news servers to run the B<pgpverify> program on the appropriate
 control messages, and take action based on the PGP key User ID that signed
 the control message, not the name and address that appear in the control
-message's From or Sender headers.
+message's From: or Sender: headers.
 
 Thus, appropriate use of the B<signcontrol> and B<pgpverify> programs
 essentially eliminates the possibility of malicious users forging Usenet
@@ -821,7 +821,7 @@
 modification, are permitted provided that the following conditions are
 met:
 
-=over 3
+=over 4
 
 =item 1.
 
@@ -862,7 +862,7 @@
 
 =head1 SEE ALSO
 
-gpgv(1), pgp(1)
+gpgv(1), pgp(1).
 
 L<ftp://ftp.isc.org/pub/pgpcontrol/> is where the most recent versions of
 B<signcontrol> and B<pgpverify> live, along with PGP public keys used for

Modified: doc/man/pgpverify.1
===================================================================
--- doc/man/pgpverify.1	2008-04-06 09:38:31 UTC (rev 7739)
+++ doc/man/pgpverify.1	2008-04-06 09:42:16 UTC (rev 7740)
@@ -175,19 +175,19 @@
 .SH "EXIT STATUS"
 .IX Header "EXIT STATUS"
 \&\fBpgpverify\fR may exit with the following statuses:
-.IP "0\&" 5
+.IP "0\&" 4
 .IX Item "0"
 The control message had a good \s-1PGP\s0 signature.
-.IP "1" 5
+.IP "1" 4
 .IX Item "1"
 The control message had no \s-1PGP\s0 signature.
-.IP "2" 5
+.IP "2" 4
 .IX Item "2"
 The control message had an unknown \s-1PGP\s0 signature.
-.IP "3" 5
+.IP "3" 4
 .IX Item "3"
 The control message had a bad \s-1PGP\s0 signature.
-.IP "255" 5
+.IP "255" 4
 .IX Item "255"
 A problem occurred not directly related to \s-1PGP\s0 analysis of signature.
 .SH "ENVIRONMENT"
@@ -205,21 +205,21 @@
 servers to automatically honor Usenet control messages based on the
 originator of the control messages and the hierarchies for which the
 control messages applied.  For example, in the past, David Lawrence always
-issued control messages for the \*(L"Big 8\*(R" hierarchies (comp, humanities,
+issued control messages for the \*(L"Big\ 8\*(R" hierarchies (comp, humanities,
 misc, news, rec, sci, soc, talk).  Usenet news administrators would
 configure their news server software to automatically honor newgroup and
 rmgroup control messages that originated from David Lawrence and applied
-to any of the Big 8 hierarchies.
+to any of the Big\ 8 hierarchies.
 .PP
 Unfortunately, Usenet news articles (including control messages) are
 notoriously easy to forge.  Soon, malicious users realized they could
-create or remove (at least temporarily) any Big 8 newsgroup they wanted by
+create or remove (at least temporarily) any Big\ 8 newsgroup they wanted by
 simply forging an appropriate control message in David Lawrence's name.
 As Usenet became more widely used, forgeries became more common.
 .PP
 The \fBpgpverify\fR program was designed to allow Usenet news administrators
 to configure their servers to cryptographically verify control messages
-before automatically acting on them.  Under the pgpverify system, a Usenet
+before automatically acting on them.  Under the \fBpgpverify\fR system, a Usenet
 hierarchy maintainer creates a \s-1PGP\s0 public/private key pair and
 disseminates the public key.  Whenever the hierarchy maintainer issues a
 control message, he uses the \fBsigncontrol\fR program to sign the control
@@ -227,7 +227,7 @@
 their news servers to run the \fBpgpverify\fR program on the appropriate
 control messages, and take action based on the \s-1PGP\s0 key User \s-1ID\s0 that signed
 the control message, not the name and address that appear in the control
-message's From or Sender headers.
+message's From: or Sender: headers.
 .PP
 Thus, appropriate use of the \fBsigncontrol\fR and \fBpgpverify\fR programs
 essentially eliminates the possibility of malicious users forging Usenet
@@ -255,21 +255,21 @@
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
-.IP "1." 3
+.IP "1." 4
 Redistributions of source code must retain the above copyright notice,
 this list of conditions and the following disclaimer.
-.IP "2." 3
+.IP "2." 4
 Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
-.IP "3." 3
+.IP "3." 4
 All advertising materials mentioning features or use of this software must
 display the following acknowledgement:
 .Sp
 .Vb 1
 \&  This product includes software developed by UUNET Technologies, Inc.
 .Ve
-.IP "4." 3
+.IP "4." 4
 The name of \s-1UUNET\s0 Technologies (\*(L"\s-1UUNET\s0\*(R") may not be used to endorse or
 promote products derived from this software without specific prior written
 permission.
@@ -286,7 +286,7 @@
 \&\s-1SOFTWARE\s0, \s-1EVEN\s0 \s-1IF\s0 \s-1ADVISED\s0 \s-1OF\s0 \s-1THE\s0 \s-1POSSIBILITY\s0 \s-1OF\s0 \s-1SUCH\s0 \s-1DAMAGE\s0.
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
-\&\fIgpgv\fR\|(1), \fIpgp\fR\|(1)
+\&\fIgpgv\fR\|(1), \fIpgp\fR\|(1).
 .PP
 <ftp://ftp.isc.org/pub/pgpcontrol/> is where the most recent versions of
 \&\fBsigncontrol\fR and \fBpgpverify\fR live, along with \s-1PGP\s0 public keys used for



More information about the inn-committers mailing list