INN commit: trunk (5 files)
INN Commit
rra at isc.org
Sun Nov 8 18:29:57 UTC 2009
Date: Sunday, November 8, 2009 @ 10:29:57
Author: iulius
Revision: 8726
With AUTHINFO USER/PASS, the username is mandatory.
Modified:
trunk/doc/pod/inews.pod
trunk/doc/pod/innxmit.pod
trunk/doc/pod/passwd.nntp.pod
trunk/samples/passwd.nntp
trunk/scripts/inncheck.in
-------------------------+
doc/pod/inews.pod | 2 +-
doc/pod/innxmit.pod | 2 +-
doc/pod/passwd.nntp.pod | 5 +++--
samples/passwd.nntp | 27 ++++++++++++++++++---------
scripts/inncheck.in | 4 ++--
5 files changed, 25 insertions(+), 15 deletions(-)
Modified: doc/pod/inews.pod
===================================================================
--- doc/pod/inews.pod 2009-11-08 18:29:06 UTC (rev 8725)
+++ doc/pod/inews.pod 2009-11-08 18:29:57 UTC (rev 8726)
@@ -139,6 +139,6 @@
=head1 SEE ALSO
-inn.conf(5), rnews(1)
+inn.conf(5), passwd.nntp(5), rnews(1).
=cut
Modified: doc/pod/innxmit.pod
===================================================================
--- doc/pod/innxmit.pod 2009-11-08 18:29:06 UTC (rev 8725)
+++ doc/pod/innxmit.pod 2009-11-08 18:29:57 UTC (rev 8726)
@@ -127,6 +127,6 @@
=head1 SEE ALSO
-ctlinnd(8), inn.conf(5), innd(8), newsfeeds(5), shlock(1).
+ctlinnd(8), inn.conf(5), innd(8), newsfeeds(5), passwd.nntp(5), shlock(1).
=cut
Modified: doc/pod/passwd.nntp.pod
===================================================================
--- doc/pod/passwd.nntp.pod 2009-11-08 18:29:06 UTC (rev 8725)
+++ doc/pod/passwd.nntp.pod 2009-11-08 18:29:57 UTC (rev 8726)
@@ -20,8 +20,9 @@
The second field is a user name, and the third is a password. If either
the username or password is empty, then that portion of the
-authentication will not occur. (For example, when connecting to a
-remote INN for peering, only the password is needed.)
+authentication will not occur. (For example, a server may require only
+a username, in which case the password is not necessary. Note that
+a username is mandatory with AUTHINFO USER/PASS.)
The optional fourth field specifies the type of authentication to use.
At present, the only recognized "authentication style" is C<authinfo>;
Modified: samples/passwd.nntp
===================================================================
--- samples/passwd.nntp 2009-11-08 18:29:06 UTC (rev 8725)
+++ samples/passwd.nntp 2009-11-08 18:29:57 UTC (rev 8726)
@@ -1,14 +1,23 @@
-## $Revision$
-## passwd.nntp - passwords for connecting to remote NNTP servers
+## $Id$
+##
+## Sample passwd.nntp configuration file.
+##
+## It permits to authenticate on remote NNTP servers.
+##
## Format:
-## <host>:<name>:<pass>[:<style>]
+## <host>:<name>:<pass>[:<style>]
+##
## Clients need only one entry, for where innd is running. The
## server will have more entries for connecting to peers to feed them
## articles.
-## <host> Host this line is for.
-## <name> Name to use to authenticate with
-## <pass> Password to send, after sending name
-## <style> Optional authentication style, defaults to "authinfo"
-## <name> and <pass> can be empty string; a peer innd doesn't need a
-## <name>, for example.
+## <host> Host this line is for.
+## <name> Name to use to authenticate with.
+## <pass> Password to send, after sending name.
+## <style> Optional authentication style, defaults to "authinfo".
+## <name> and <pass> can be an empty string (in which case the corresponding
+## information is not sent). Note that a username is mandatory with AUTHINFO
+## USER/PASS authentication.
+##
+## See the passwd.nntp man page for more information.
+#
#news.foo.com:rsalz:martha
Modified: scripts/inncheck.in
===================================================================
--- scripts/inncheck.in 2009-11-08 18:29:06 UTC (rev 8725)
+++ scripts/inncheck.in 2009-11-08 18:29:57 UTC (rev 8726)
@@ -590,8 +590,8 @@
next input;
print "$file:$line: malformed line.\n";
}
- print "$file:$line: username/password must both be blank or non-blank\n"
- if ( $name eq "" && $pass ne "" ) || ($name ne "" && $pass eq "");
+ print "$file:$line: missing username\n"
+ if ( $name eq "" );
}
1;
}
More information about the inn-committers
mailing list