Send inn-committers mailing list submissions to
inn-committers@lists.isc.org
To subscribe or unsubscribe via the World Wide Web, visit
https://lists.isc.org/mailman/listinfo/inn-committers
or, via email, send a message with subject or body 'help' to
inn-committers-requ...@lists.isc.org
You can reach the person managing the list at
inn-committers-ow...@lists.isc.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of inn-committers digest..."
Today's Topics:
1. INN commit: trunk (3 files) (INN Commit)
2. INN commit: branches/2.5 (3 files) (INN Commit)
3. INN commit: branches/2.5/m4 (libtool.m4) (INN Commit)
4. INN commit: trunk (20 files) (INN Commit)
----------------------------------------------------------------------
Message: 1
Date: Sat, 15 Mar 2014 09:49:12 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (3 files)
Message-ID: <20140315164912.1d79b67...@hope.eyrie.org>
Date: Saturday, March 15, 2014 @ 09:49:11
Author: iulius
Revision: 9620
Handle several UIDs on PGP keys when verifying control messages
Fixed a long-standing limitation on how controlchan and pgpverify
were checking the signer of control messages. They now properly handle
the case of several UIDs being defined on a single PGP key, as well
as the presence of spaces into UIDs. In previous versions of INN,
a few valid control messages got ignored because of that limitation
(fido.ger.* and grisbi.* were for instance impacted).
Modified:
trunk/control/controlchan.in
trunk/control/pgpverify.in
trunk/doc/pod/news.pod
------------------------+
control/controlchan.in | 7 ++-
control/pgpverify.in | 90 ++++++++++++++++++++++++++++++++++-------------
doc/pod/news.pod | 19 +++++++++
3 files changed, 89 insertions(+), 27 deletions(-)
Modified: control/controlchan.in
===================================================================
--- control/controlchan.in 2014-03-13 13:18:38 UTC (rev 9619)
+++ control/controlchan.in 2014-03-15 16:49:11 UTC (rev 9620)
@@ -446,7 +446,7 @@
if (!exists($keyresults{$keyowner})) {
if ($INN::Config::pgpverify and $INN::Config::pgpverify =~
/^(?:true|on|yes)$/i) {
my $pgpresult = defined &local_pgpverify ?
- local_pgpverify($token, $article) : pgpverify($token);
+ local_pgpverify($token, $article, $keyowner) :
pgpverify($token, $keyowner);
if ($keyowner eq $pgpresult) {
$keyresults{$keyowner} = 'doit';
} else {
@@ -554,12 +554,13 @@
sub pgpverify {
my $token = shift;
+ my $keyid = shift;
if ($token =~ /^\@.+\@$/) {
open(PGPCHECK, "$INN::Config::newsbin/sm -q $token "
- . "| $INN::Config::newsbin/pgpverify |") or goto ERROR;
+ . "| $INN::Config::newsbin/pgpverify --findid='$keyid' |") or goto
ERROR;
} else {
- open(PGPCHECK, "$INN::Config::newsbin/pgpverify < $token |") or goto
ERROR;
+ open(PGPCHECK, "$INN::Config::newsbin/pgpverify --findid='$keyid' <
$token |") or goto ERROR;
}
my $pgpresult = <PGPCHECK>;
close PGPCHECK or goto ERROR;
Modified: control/pgpverify.in
===================================================================
--- control/pgpverify.in 2014-03-13 13:18:38 UTC (rev 9619)
+++ control/pgpverify.in 2014-03-15 16:49:11 UTC (rev 9620)
@@ -3,8 +3,8 @@
# If running inside INN, uncomment the above and point to INN::Config.
#
# Written April 1996, <t...@isc.org> (David C Lawrence)
-# Currently maintained by Russ Allbery <r...@stanford.edu>
-# Version 1.28, 2007-09-18
+# Currently maintained by Russ Allbery <ea...@eyrie.org>
+# Version 1.29, 2014-04-15
#
# NOTICE TO INN MAINTAINERS: The version that is shipped with INN is the
# same as the version that I make available to the rest of the world
@@ -12,10 +12,18 @@
#
# This program requires Perl 5, probably at least about Perl 5.003 since
# that's when FileHandle was introduced. If you want to use this program
-# and your Perl is too old, please contact me (r...@stanford.edu) and tell
+# and your Perl is too old, please contact me (ea...@eyrie.org) and tell
# me about it; I want to know what old versions of Perl are still used in
# practice.
#
+# Changes from 1.28 -> 1.29
+# -- Disambiguate numbered lists from description lists in POD to silent
+# a pod2man warning.
+# -- Add a --findid=<string> flag to explicitly search for <string> in the
+# output from PGP's analysis of the message. In case the signature is
+# valid but does not contain <string>, pgpverify exits with the new
+# exit status 4.
+#
# Changes from 1.27 -> 1.28
# -- Use the INN::Config Perl module instead of innshellvars.pl to
# accomodate the new build process of INN 2.5.
@@ -196,23 +204,23 @@
use strict;
use vars qw($gpgv $pgp $keyring $tmp $tmpdir $lockdir $syslog_method
- $syslog_facility $syslog_level $log_date $test $messageid);
+ $syslog_facility $syslog_level $log_date $findid $test $messageid);
use Fcntl qw(O_WRONLY O_CREAT O_EXCL);
use FileHandle;
use IPC::Open3 qw(open3);
use POSIX qw(strftime);
+use Getopt::Long;
-# Turn on test mode if the first argument is '-test'.
-if (@ARGV && $ARGV[0] eq '-test') {
- shift @ARGV;
- $test = 1;
-}
+# Check the arguments passed to pgpverify.
+# If a syntax error occurs, do not syslog it: such an error is almost
+# certainly from someone running the script manually.
+Getopt::Long::Configure('bundling_override');
+GetOptions(
+ 'test' => sub { $test = 1 },
+ 'findid=s' => \$findid
+) or die "Usage: $0 [--findid='string'] [--test] < message\n";
-# Not syslogged, such an error is almost certainly from someone running
-# the script manually.
-die "Usage: $0 < message\n" if @ARGV != 0;
-
# Grab various defaults from INN::Config if running inside INN.
$pgp = $INN::Config::pgp
if $INN::Config::pgp && $INN::Config::pgp ne
"no-pgp-found-during-configure";
@@ -366,7 +374,9 @@
# 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 is verified. 0 means good signature, 1
-# means bad data, 2 means an unknown signer, and 3 means a bad signature.
+# means bad data, 2 means an unknown signer, 3 means a bad signature, and
+# 4 means good signature without having found the argument given to the
+# --findid flag.
# In the event of an error, we report with errmsg.
#
# This code is taken almost verbatim from PGP::Sign except for the code to
@@ -497,34 +507,45 @@
$signer = $1;
} elsif (/\[GNUPG:\]\s+NODATA/ || /\[GNUPG:\]\s+UNEXPECTED/) {
$ok = 1;
+ last;
} elsif (/\[GNUPG:\]\s+NO_PUBKEY/) {
$ok = 2;
+ last;
} elsif (/\[GNUPG:\]\s+BADSIG\s+/) {
$ok = 3;
+ last;
}
} else {
if (/^Good signature from user(?::\s+(.*)|\s+\"(.*)\"\.)$/m) {
$signer = $+;
$ok = 0;
- last;
} elsif (/^Good signature made .* by key:\n.+\n\s+\"(.*)\"/m) {
$signer = $1;
$ok = 0;
- last;
} elsif (/^\S+: Good signature from \"(.*)\"/m) {
$signer = $1;
$ok = 0;
- last;
} elsif (/^(?:\S+: )?Bad signature /im) {
$ok = 3;
last;
}
}
+ # If the --findid flag is used, and the signature is good,
+ # override the value of the signer with the string specified in
+ # the --findid flag.
+ if (defined ($findid) and $ok eq 0) {
+ $signer = $findid if (/$findid/);
+ }
}
close $input;
waitpid ($pid, 0);
unlink ($filename, "$filename.asc");
umask $umask;
+
+ if (defined ($findid) and $ok eq 0 and $signer ne $findid) {
+ $ok = 4;
+ }
+
return ($ok, $signer || '');
}
@@ -687,7 +708,7 @@
=head1 SYNOPSIS
-B<pgpverify> [B<-test>] < I<message>
+B<pgpverify> [B<--findid>=I<string>] [B<--test>] < I<message>
=head1 DESCRIPTION
@@ -723,11 +744,26 @@
=head1 OPTIONS
-The B<-test> flag causes B<pgpverify> to print out the input that it is
+=over 4
+
+=item B<--findid>=I<string>
+
+The B<--findid> flag causes B<pgpverify> to explicitly search for
+I<string> in the output from PGP's analysis of the message. This option
+is useful when several UIDs are defined on a single PGP key, and the
+caller to B<pgpverify> needs checking whether a given one is defined on
+this key. In case the signature is valid but does not contain I<string>,
+B<pgpverify> exits with exit status 4.
+
+=item B<--test>
+
+The B<--test> flag causes B<pgpverify> to print out the input that it is
passing to PGP (which is a reconstructed version of the input that
supposedly created the control message) as well as the output from PGP's
analysis of the message.
+=back
+
=head1 EXIT STATUS
B<pgpverify> may exit with the following statuses:
@@ -738,20 +774,26 @@
The control message had a good PGP signature.
-=item 1
+=item 1Z<>
The control message had no PGP signature.
-=item 2
+=item 2Z<>
The control message had an unknown PGP signature.
-=item 3
+=item 3Z<>
The control message had a bad PGP signature.
-=item 255
+=item 4Z<>
+The control message had a good PGP signature but the argument given
+to the B<--findid> flag had non been found in the output from PGP's
+analysis of the message.
+
+=item 255Z<>
+
A problem occurred not directly related to PGP analysis of signature.
=back
@@ -810,7 +852,7 @@
B<pgpverify> was written by David C Lawrence <t...@isc.org>. Manual page
provided by James Ralston. It is currently maintained by Russ Allbery
-<r...@stanford.edu>.
+<ea...@eyrie.org>.
=head1 COPYRIGHT AND LICENSE
Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod 2014-03-13 13:18:38 UTC (rev 9619)
+++ doc/pod/news.pod 2014-03-15 16:49:11 UTC (rev 9620)
@@ -176,6 +176,21 @@
=item *
+An up-to-date F<control.ctl> file is provided with this release. You should
+manually update your F<control.ctl> file with the new information recorded
+about Usenet hierarchies.
+
+=item *
+
+Fixed a long-standing limitation on how B<controlchan> and B<pgpverify>
+were checking the signer of control messages. They now properly handle
+the case of several UIDs being defined on a single PGP key, as well
+as the presence of spaces into UIDs. In previous versions of INN,
+a few valid control messages got ignored because of that limitation
+(fido.ger.* and grisbi.* were for instance impacted).
+
+=item *
+
As the name of the F<radius.conf> configuration file shipped with INN
for the B<nnrpd> authenticator against a RADIUS server conflicts with
the libradius package, this file is renamed to F<inn-radius.conf>
@@ -276,6 +291,10 @@
in I<pathetc>, named differently so that their default contents are
not displayed to news clients before they get customised.
+=item *
+
+Other minor bug fixes and documentation improvements.
+
=back
=head1 Changes in 2.5.3
------------------------------
Message: 2
Date: Sat, 15 Mar 2014 09:50:03 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: branches/2.5 (3 files)
Message-ID: <20140315165003.a7d6667...@hope.eyrie.org>
Date: Saturday, March 15, 2014 @ 09:50:03
Author: iulius
Revision: 9621
Handle several UIDs on PGP keys when verifying control messages
Fixed a long-standing limitation on how controlchan and pgpverify
were checking the signer of control messages. They now properly handle
the case of several UIDs being defined on a single PGP key, as well
as the presence of spaces into UIDs. In previous versions of INN,
a few valid control messages got ignored because of that limitation
(fido.ger.* and grisbi.* were for instance impacted).
Modified:
branches/2.5/control/controlchan.in
branches/2.5/control/pgpverify.in
branches/2.5/doc/pod/news.pod
------------------------+
control/controlchan.in | 7 ++-
control/pgpverify.in | 90 ++++++++++++++++++++++++++++++++++-------------
doc/pod/news.pod | 19 +++++++++
3 files changed, 89 insertions(+), 27 deletions(-)
Modified: control/controlchan.in
===================================================================
--- control/controlchan.in 2014-03-15 16:49:11 UTC (rev 9620)
+++ control/controlchan.in 2014-03-15 16:50:03 UTC (rev 9621)
@@ -446,7 +446,7 @@
if (!exists($keyresults{$keyowner})) {
if ($INN::Config::pgpverify and $INN::Config::pgpverify =~
/^(?:true|on|yes)$/i) {
my $pgpresult = defined &local_pgpverify ?
- local_pgpverify($token, $article) : pgpverify($token);
+ local_pgpverify($token, $article, $keyowner) :
pgpverify($token, $keyowner);
if ($keyowner eq $pgpresult) {
$keyresults{$keyowner} = 'doit';
} else {
@@ -554,12 +554,13 @@
sub pgpverify {
my $token = shift;
+ my $keyid = shift;
if ($token =~ /^\@.+\@$/) {
open(PGPCHECK, "$INN::Config::newsbin/sm -q $token "
- . "| $INN::Config::newsbin/pgpverify |") or goto ERROR;
+ . "| $INN::Config::newsbin/pgpverify --findid='$keyid' |") or goto
ERROR;
} else {
- open(PGPCHECK, "$INN::Config::newsbin/pgpverify < $token |") or goto
ERROR;
+ open(PGPCHECK, "$INN::Config::newsbin/pgpverify --findid='$keyid' <
$token |") or goto ERROR;
}
my $pgpresult = <PGPCHECK>;
close PGPCHECK or goto ERROR;
Modified: control/pgpverify.in
===================================================================
--- control/pgpverify.in 2014-03-15 16:49:11 UTC (rev 9620)
+++ control/pgpverify.in 2014-03-15 16:50:03 UTC (rev 9621)
@@ -3,8 +3,8 @@
# If running inside INN, uncomment the above and point to INN::Config.
#
# Written April 1996, <t...@isc.org> (David C Lawrence)
-# Currently maintained by Russ Allbery <r...@stanford.edu>
-# Version 1.28, 2007-09-18
+# Currently maintained by Russ Allbery <ea...@eyrie.org>
+# Version 1.29, 2014-04-15
#
# NOTICE TO INN MAINTAINERS: The version that is shipped with INN is the
# same as the version that I make available to the rest of the world
@@ -12,10 +12,18 @@
#
# This program requires Perl 5, probably at least about Perl 5.003 since
# that's when FileHandle was introduced. If you want to use this program
-# and your Perl is too old, please contact me (r...@stanford.edu) and tell
+# and your Perl is too old, please contact me (ea...@eyrie.org) and tell
# me about it; I want to know what old versions of Perl are still used in
# practice.
#
+# Changes from 1.28 -> 1.29
+# -- Disambiguate numbered lists from description lists in POD to silent
+# a pod2man warning.
+# -- Add a --findid=<string> flag to explicitly search for <string> in the
+# output from PGP's analysis of the message. In case the signature is
+# valid but does not contain <string>, pgpverify exits with the new
+# exit status 4.
+#
# Changes from 1.27 -> 1.28
# -- Use the INN::Config Perl module instead of innshellvars.pl to
# accomodate the new build process of INN 2.5.
@@ -196,23 +204,23 @@
use strict;
use vars qw($gpgv $pgp $keyring $tmp $tmpdir $lockdir $syslog_method
- $syslog_facility $syslog_level $log_date $test $messageid);
+ $syslog_facility $syslog_level $log_date $findid $test $messageid);
use Fcntl qw(O_WRONLY O_CREAT O_EXCL);
use FileHandle;
use IPC::Open3 qw(open3);
use POSIX qw(strftime);
+use Getopt::Long;
-# Turn on test mode if the first argument is '-test'.
-if (@ARGV && $ARGV[0] eq '-test') {
- shift @ARGV;
- $test = 1;
-}
+# Check the arguments passed to pgpverify.
+# If a syntax error occurs, do not syslog it: such an error is almost
+# certainly from someone running the script manually.
+Getopt::Long::Configure('bundling_override');
+GetOptions(
+ 'test' => sub { $test = 1 },
+ 'findid=s' => \$findid
+) or die "Usage: $0 [--findid='string'] [--test] < message\n";
-# Not syslogged, such an error is almost certainly from someone running
-# the script manually.
-die "Usage: $0 < message\n" if @ARGV != 0;
-
# Grab various defaults from INN::Config if running inside INN.
$pgp = $INN::Config::pgp
if $INN::Config::pgp && $INN::Config::pgp ne
"no-pgp-found-during-configure";
@@ -366,7 +374,9 @@
# 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 is verified. 0 means good signature, 1
-# means bad data, 2 means an unknown signer, and 3 means a bad signature.
+# means bad data, 2 means an unknown signer, 3 means a bad signature, and
+# 4 means good signature without having found the argument given to the
+# --findid flag.
# In the event of an error, we report with errmsg.
#
# This code is taken almost verbatim from PGP::Sign except for the code to
@@ -497,34 +507,45 @@
$signer = $1;
} elsif (/\[GNUPG:\]\s+NODATA/ || /\[GNUPG:\]\s+UNEXPECTED/) {
$ok = 1;
+ last;
} elsif (/\[GNUPG:\]\s+NO_PUBKEY/) {
$ok = 2;
+ last;
} elsif (/\[GNUPG:\]\s+BADSIG\s+/) {
$ok = 3;
+ last;
}
} else {
if (/^Good signature from user(?::\s+(.*)|\s+\"(.*)\"\.)$/m) {
$signer = $+;
$ok = 0;
- last;
} elsif (/^Good signature made .* by key:\n.+\n\s+\"(.*)\"/m) {
$signer = $1;
$ok = 0;
- last;
} elsif (/^\S+: Good signature from \"(.*)\"/m) {
$signer = $1;
$ok = 0;
- last;
} elsif (/^(?:\S+: )?Bad signature /im) {
$ok = 3;
last;
}
}
+ # If the --findid flag is used, and the signature is good,
+ # override the value of the signer with the string specified in
+ # the --findid flag.
+ if (defined ($findid) and $ok eq 0) {
+ $signer = $findid if (/$findid/);
+ }
}
close $input;
waitpid ($pid, 0);
unlink ($filename, "$filename.asc");
umask $umask;
+
+ if (defined ($findid) and $ok eq 0 and $signer ne $findid) {
+ $ok = 4;
+ }
+
return ($ok, $signer || '');
}
@@ -687,7 +708,7 @@
=head1 SYNOPSIS
-B<pgpverify> [B<-test>] < I<message>
+B<pgpverify> [B<--findid>=I<string>] [B<--test>] < I<message>
=head1 DESCRIPTION
@@ -723,11 +744,26 @@
=head1 OPTIONS
-The B<-test> flag causes B<pgpverify> to print out the input that it is
+=over 4
+
+=item B<--findid>=I<string>
+
+The B<--findid> flag causes B<pgpverify> to explicitly search for
+I<string> in the output from PGP's analysis of the message. This option
+is useful when several UIDs are defined on a single PGP key, and the
+caller to B<pgpverify> needs checking whether a given one is defined on
+this key. In case the signature is valid but does not contain I<string>,
+B<pgpverify> exits with exit status 4.
+
+=item B<--test>
+
+The B<--test> flag causes B<pgpverify> to print out the input that it is
passing to PGP (which is a reconstructed version of the input that
supposedly created the control message) as well as the output from PGP's
analysis of the message.
+=back
+
=head1 EXIT STATUS
B<pgpverify> may exit with the following statuses:
@@ -738,20 +774,26 @@
The control message had a good PGP signature.
-=item 1
+=item 1Z<>
The control message had no PGP signature.
-=item 2
+=item 2Z<>
The control message had an unknown PGP signature.
-=item 3
+=item 3Z<>
The control message had a bad PGP signature.
-=item 255
+=item 4Z<>
+The control message had a good PGP signature but the argument given
+to the B<--findid> flag had non been found in the output from PGP's
+analysis of the message.
+
+=item 255Z<>
+
A problem occurred not directly related to PGP analysis of signature.
=back
@@ -810,7 +852,7 @@
B<pgpverify> was written by David C Lawrence <t...@isc.org>. Manual page
provided by James Ralston. It is currently maintained by Russ Allbery
-<r...@stanford.edu>.
+<ea...@eyrie.org>.
=head1 COPYRIGHT AND LICENSE
Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod 2014-03-15 16:49:11 UTC (rev 9620)
+++ doc/pod/news.pod 2014-03-15 16:50:03 UTC (rev 9621)
@@ -4,6 +4,21 @@
=item *
+An up-to-date F<control.ctl> file is provided with this release. You should
+manually update your F<control.ctl> file with the new information recorded
+about Usenet hierarchies.
+
+=item *
+
+Fixed a long-standing limitation on how B<controlchan> and B<pgpverify>
+were checking the signer of control messages. They now properly handle
+the case of several UIDs being defined on a single PGP key, as well
+as the presence of spaces into UIDs. In previous versions of INN,
+a few valid control messages got ignored because of that limitation
+(fido.ger.* and grisbi.* were for instance impacted).
+
+=item *
+
As the name of the F<radius.conf> configuration file shipped with INN
for the B<nnrpd> authenticator against a RADIUS server conflicts with
the libradius package, this file is renamed to F<inn-radius.conf>
@@ -104,6 +119,10 @@
in I<pathetc>, named differently so that their default contents are
not displayed to news clients before they get customised.
+=item *
+
+Other minor bug fixes and documentation improvements.
+
=back
=head1 Changes in 2.5.3
------------------------------
Message: 3
Date: Sat, 15 Mar 2014 13:49:44 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: branches/2.5/m4 (libtool.m4)
Message-ID: <20140315204944.4ecf567...@hope.eyrie.org>
Date: Saturday, March 15, 2014 @ 13:49:43
Author: iulius
Revision: 9622
Fix AC_LANG_PROGRAM warnings from Autoconf 2.68
Autoconf 2.68 complains with several:
AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body
Libtool 2.4 (used by INN 2.6) fixed the issue but as INN 2.5 still uses Libtool
2.2.6b, just backport commit 2680f79c22e6bb1f8b9c7b5428da728b7e028b0c from git
Libtool.
* m4/libtool.m4 (_LT_SYS_MODULE_PATH_AIX): Fix
underquoted AC_LANG_PROGRAM call.
* m4/libtool.m4 (_LT_LINKER_SHLIBS) [irix, GCC]: Use
the right source for the given language.
Modified:
branches/2.5/m4/libtool.m4
------------+
libtool.m4 | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
Modified: libtool.m4
===================================================================
--- libtool.m4 2014-03-15 16:50:03 UTC (rev 9621)
+++ libtool.m4 2014-03-15 20:49:43 UTC (rev 9622)
@@ -1021,7 +1021,7 @@
# to the aix ld manual.
m4_defun([_LT_SYS_MODULE_PATH_AIX],
[m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+AC_LINK_IFELSE([AC_LANG_PROGRAM],[
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
/^0/ {
@@ -4826,9 +4826,18 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo
${wl}-update_registry ${wl}/dev/null"
- AC_LINK_IFELSE(int foo(void) {},
+ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE(
+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+ [C++], [[int foo (void) { return 0; }]],
+ [Fortran 77], [[
+ subroutine foo
+ end]],
+ [Fortran], [[
+ subroutine foo
+ end]])])], [
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO
"X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry
${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o
$lib'
- )
+ ])
LDFLAGS="$save_LDFLAGS"
else
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version
$verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
------------------------------
Message: 4
Date: Sat, 15 Mar 2014 15:29:46 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (20 files)
Message-ID: <20140315222946.b0e2667...@hope.eyrie.org>
Date: Saturday, March 15, 2014 @ 15:29:46
Author: iulius
Revision: 9623
Fix clang warnings about unused variables
Modified:
trunk/backends/buffchan.c
trunk/backends/cvtbatch.c
trunk/backends/shlock.c
trunk/expire/fastrm.c
trunk/expire/makedbz.c
trunk/expire/makehistory.c
trunk/expire/prunehistory.c
trunk/frontends/ctlinnd.c
trunk/frontends/getlist.c
trunk/frontends/rnews.c
trunk/innfeed/endpoint.c
trunk/innfeed/imap_connection.c
trunk/innfeed/tape.c
trunk/nnrpd/perm.c
trunk/nnrpd/post.c
trunk/tests/lib/confparse-t.c
trunk/tests/nnrpd/auth-ext-t.c
trunk/tests/overview/api-t.c
trunk/tests/runtests.c
trunk/tests/util/innbind-t.c
---------------------------+
backends/buffchan.c | 1 -
backends/cvtbatch.c | 2 --
backends/shlock.c | 1 -
expire/fastrm.c | 1 -
expire/makedbz.c | 1 -
expire/makehistory.c | 3 ---
expire/prunehistory.c | 1 -
frontends/ctlinnd.c | 1 -
frontends/getlist.c | 2 +-
frontends/rnews.c | 11 ++++++-----
innfeed/endpoint.c | 4 ----
innfeed/imap_connection.c | 23 ++++++++---------------
innfeed/tape.c | 2 --
nnrpd/perm.c | 2 +-
nnrpd/post.c | 2 +-
tests/lib/confparse-t.c | 2 +-
tests/nnrpd/auth-ext-t.c | 2 +-
tests/overview/api-t.c | 2 +-
tests/runtests.c | 1 -
tests/util/innbind-t.c | 2 +-
20 files changed, 21 insertions(+), 45 deletions(-)
Modified: backends/buffchan.c
===================================================================
--- backends/buffchan.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ backends/buffchan.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -409,7 +409,6 @@
break;
}
ac -= optind;
- av += optind;
if (ac)
die("usage error");
Modified: backends/cvtbatch.c
===================================================================
--- backends/cvtbatch.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ backends/cvtbatch.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -1,5 +1,4 @@
/* $Id$
-**
** Read file list on standard input and spew out batch files.
*/
@@ -57,7 +56,6 @@
}
}
ac -= optind;
- av += optind;
if (ac)
die("usage error");
Modified: backends/shlock.c
===================================================================
--- backends/shlock.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ backends/shlock.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -172,7 +172,6 @@
}
ac -= optind;
- av += optind;
if (ac || pid == 0 || name == NULL) {
Usage();
}
Modified: expire/fastrm.c
===================================================================
--- expire/fastrm.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ expire/fastrm.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -273,7 +273,6 @@
dlen = strlen(line);
dir = xstrdup(line);
} else {
- p = line;
dlen = -1;
dir = NULL;
}
Modified: expire/makedbz.c
===================================================================
--- expire/makedbz.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ expire/makedbz.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -273,7 +273,6 @@
}
argc -= optind;
- argv += optind;
if (argc) {
Usage();
}
Modified: expire/makehistory.c
===================================================================
--- expire/makehistory.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ expire/makehistory.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -710,10 +710,8 @@
}
}
- MessageID = (char *)NULL;
Arrived = art->arrived;
Expires = 0;
- Posted = 0;
if (!Msgidp->HasHeader) {
warn("no Message-ID header in %s", TokenToText(*art->token));
@@ -938,7 +936,6 @@
}
}
argc -= optind;
- argv += optind;
if (argc) {
fprintf(stderr, "%s", usage);
exit(1);
Modified: expire/prunehistory.c
===================================================================
--- expire/prunehistory.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ expire/prunehistory.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -62,7 +62,6 @@
break;
}
ac -= optind;
- av += optind;
if (ac) {
Usage();
rc = 1;
Modified: frontends/ctlinnd.c
===================================================================
--- frontends/ctlinnd.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ frontends/ctlinnd.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -262,7 +262,6 @@
case 3:
break;
}
- ac = 3;
}
else if (ac > cp->argc && cp->Glue) {
/* Glue any extra words together. */
Modified: frontends/getlist.c
===================================================================
--- frontends/getlist.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ frontends/getlist.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -306,7 +306,7 @@
/* Be polite and say goodbye; it gives the server a chance to shut the
connection down cleanly. */
if (nntp_send_line(nntp, "QUIT"))
- status = nntp_read_response(nntp, &response, &line);
+ nntp_read_response(nntp, &response, &line);
nntp_free(nntp);
exit(0);
}
Modified: frontends/rnews.c
===================================================================
--- frontends/rnews.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ frontends/rnews.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -434,12 +434,13 @@
seems like the best of a set of bad options; Reject would save the
article into bad and then someone might reprocess it, leaving us with
accepting the truncated version. */
- for (p = article, left = artsize; left; p += i, left -= i)
- if ((i = read(fd, p, left)) <= 0) {
- i = errno;
+ for (p = article, left = artsize; left; p += i, left -= i) {
+ i = read(fd, p, left);
+ if (i <= 0) {
warn("cannot read, wanted %d got %d", artsize, artsize - left);
- return true;
- }
+ return true;
+ }
+ }
if (p[-1] != '\n') {
*p++ = '\n';
artsize++;
Modified: innfeed/endpoint.c
===================================================================
--- innfeed/endpoint.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ innfeed/endpoint.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -940,8 +940,6 @@
bCount = (bCount > IOV_MAX ? IOV_MAX : bCount) ;
- i = 0 ;
-
/* now set up the iovecs for the readv */
if (bCount > 0)
{
@@ -1064,8 +1062,6 @@
bCount = (bCount > IOV_MAX ? IOV_MAX : bCount) ;
- i = 0 ;
-
if (bCount > 0)
{
vp = xcalloc (bCount, sizeof(struct iovec)) ;
Modified: innfeed/imap_connection.c
===================================================================
--- innfeed/imap_connection.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ innfeed/imap_connection.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -1043,7 +1043,6 @@
return RET_FAIL;
}
- res = RET_OK;
/* now let's look at the control to see what it is */
if (!strncasecmp(control_header,"newgroup",8)) {
control_header += 8;
@@ -1758,10 +1757,9 @@
ASSERT(cxn->imap_sleepTimerId == 0);
- /* make the IMAP connection */
- result = SetupIMAPConnection(cxn,
- cxn->ServerName,
- IMAP_PORT);
+ /* make the IMAP connection */
SetupIMAPConnection(cxn,
+ cxn->ServerName,
+ IMAP_PORT);
/* Listen to the intro and start the authenticating process */
result = imap_listenintro(cxn);
@@ -4016,9 +4014,9 @@
result = FindHeader(cxn->current_bufs, "Followup-To",
&to_list, &to_list_end);
- if ((result != RET_OK) || (to_list == NULL)) {
- result = FindHeader(cxn->current_bufs, "Newsgroups",
- &to_list, &to_list_end);
+ if ((result != RET_OK) || (to_list == NULL)){
+ FindHeader(cxn->current_bufs, "Newsgroups",
+ &to_list, &to_list_end);
}
/* free's original to_list */
@@ -4471,7 +4469,7 @@
{
const char *peerName ;
time_t now = theTime() ;
- int total, good, bad;
+ int total, bad;
ASSERT (cxn != NULL) ;
@@ -4482,15 +4480,11 @@
total += cxn->create_succeeded + cxn->create_failed;
total += cxn->remove_succeeded + cxn->remove_failed;
- good = cxn->lmtp_succeeded;
- good += cxn->cancel_succeeded;
- good += cxn->create_succeeded;
- good += cxn->remove_succeeded;
-
bad = cxn->lmtp_failed;
bad += cxn->cancel_failed;
bad += cxn->create_failed;
bad += cxn->remove_failed;
+
notice ("%s:%d %s seconds %ld accepted %d refused %d rejected %d",
peerName, cxn->ident, (final ? "final" : "checkpoint"),
(long) (now - cxn->timeCon), total, 0, bad);
@@ -4509,7 +4503,6 @@
if (cxn->timeCon > 0)
cxn->timeCon = theTime() ;
}
-
}
/* return the number of articles the connection can be given. This lets
Modified: innfeed/tape.c
===================================================================
--- innfeed/tape.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ innfeed/tape.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -1090,8 +1090,6 @@
tape->inputFilename) ;
else
inpExists = true ;
-
- outExists = false ;
}
/* now open up the input file and seek to the proper position. */
Modified: nnrpd/perm.c
===================================================================
--- nnrpd/perm.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ nnrpd/perm.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -1127,7 +1127,7 @@
/* Are we editing an auth or access group? */
inwhat = 0;
- newgroup = curgroup = 0;
+ curgroup = 0;
tok = CONFgettoken(PERMtoks, cf->f);
Modified: nnrpd/post.c
===================================================================
--- nnrpd/post.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ nnrpd/post.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -1099,7 +1099,7 @@
}
strlcpy(frombuf, HDR(HDR__FROM), sizeof(frombuf));
- for (i = 0, p = frombuf;p < frombuf + sizeof(frombuf);)
+ for (p = frombuf;p < frombuf + sizeof(frombuf);)
if ((p = strchr(p, '\n')) == NULL)
break;
else
Modified: tests/lib/confparse-t.c
===================================================================
--- tests/lib/confparse-t.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ tests/lib/confparse-t.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -691,7 +691,7 @@
n = test_warnings_uint(n);
n = test_warnings_real(n);
n = test_warnings_string(n);
- n = test_warnings_list(n);
+ test_warnings_list(n);
return 0;
}
Modified: tests/nnrpd/auth-ext-t.c
===================================================================
--- tests/nnrpd/auth-ext-t.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ tests/nnrpd/auth-ext-t.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -129,7 +129,7 @@
"example.com auth: program caught signal 1\n");
n = ok_external(n, client, "newline", "tester", NULL);
n = ok_external(n, client, "partial", "tester", NULL);
- n = ok_external(n, client, "partial-error", NULL,
+ ok_external(n, client, "partial-error", NULL,
"example.com auth: program error: This is an error\n");
return 0;
Modified: tests/overview/api-t.c
===================================================================
--- tests/overview/api-t.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ tests/overview/api-t.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -704,7 +704,7 @@
free(innconf->ovmethod);
innconf->ovmethod = xstrdup("buffindexed");
diag("buffindexed");
- n = overview_tests(n);
+ overview_tests(n);
return 0;
}
Modified: tests/runtests.c
===================================================================
--- tests/runtests.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ tests/runtests.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -1149,7 +1149,6 @@
fprintf(stderr, usage_message, argv[0], argv[0]);
exit(1);
}
- argc -= optind;
argv += optind;
if (source != NULL) {
Modified: tests/util/innbind-t.c
===================================================================
--- tests/util/innbind-t.c 2014-03-15 20:49:43 UTC (rev 9622)
+++ tests/util/innbind-t.c 2014-03-15 22:29:46 UTC (rev 9623)
@@ -323,7 +323,7 @@
n = test_ipv4(1); /* Tests 1-5. */
n = test_ipv6(n); /* Tests 6-10. */
- n = test_sendfd(n); /* Tests 11-15. */
+ test_sendfd(n); /* Tests 11-15. */
return 0;
}
------------------------------
_______________________________________________
inn-committers mailing list
inn-committers@lists.isc.org
https://lists.isc.org/mailman/listinfo/inn-committers
End of inn-committers Digest, Vol 61, Issue 4
*********************************************
