Author: sidney
Date: Mon Jan 1 15:09:18 2007
New Revision: 491679
URL: http://svn.apache.org/viewvc?view=rev&rev=491679
Log:
update perldoc and man pages for new ssl-version options in spamc and spamd
Modified:
spamassassin/trunk/spamc/spamc.pod
spamassassin/trunk/spamd/spamd.raw
Modified: spamassassin/trunk/spamc/spamc.pod
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamc/spamc.pod?view=diff&rev=491679&r1=491678&r2=491679
==============================================================================
--- spamassassin/trunk/spamc/spamc.pod (original)
+++ spamassassin/trunk/spamc/spamc.pod Mon Jan 1 15:09:18 2007
@@ -157,10 +157,14 @@
The size is specified in bytes, as a positive integer greater than 0.
For example, B<-s 500000>.
-=item B<-S>, B<--ssl>
+=item B<-S>, B<--ssl>, B<--ssl>=I<sslversion>
If spamc was built with support for SSL, encrypt data to and from the
spamd process with SSL; spamd must support SSL as well.
+I<sslversion> specifies the SSL protocol version to use, one of
+C<sslv2>, C<sslv3>, C<tlsv1>, or C<sslv23>. The default, C<sslv23>, causes
+spamc to use a SSLv2 hello handshake then negotiate use of SSLv3 or TLSv1
+protocol if the spamd server can accept it.
=item B<-t> I<timeout>, B<--timeout>=I<timeout>
Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?view=diff&rev=491679&r1=491678&r2=491679
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Mon Jan 1 15:09:18 2007
@@ -2440,6 +2440,7 @@
-H [dir], --helper-home-dir[=dir] Specify a different HOME directory
--ssl Run an SSL server
--ssl-port port Listen on port for SSL connections
+ --ssl-version sslversion Specify SSL protocol version to use
--server-key keyfile Specify an SSL keyfile
--server-cert certfile Specify an SSL certificate
--socketpath=path Listen on given UNIX domain socket
@@ -2841,8 +2842,8 @@
=item B<--ssl>
-Accept only SSL connections. The B<IO::Socket::SSL> perl module must be
-installed.
+Accept only SSL connections on the associated port.
+The B<IO::Socket::SSL> perl module must be installed.
If the B<--ssl> switch is used, and B<--ssl-port> is not supplied, then
B<--port> port will be used to accept SSL connections instead of unencrypted
@@ -2855,6 +2856,15 @@
Optionally specifies the port number for the server to listen on for
SSL connections (default: whatever --port uses). See B<--ssl> for
more details.
+
+=item B<--ssl-version>=I<sslversion>
+
+Specify the SSL protocol version to use, one of
+B<sslv2>, B<sslv3>, B<tlsv1>, or B<sslv23>.
+The default, B<sslv23>, is the most flexible, accepting a SSLv2 or higher
+hello handshake, then negotiating use of SSLv3 or TLSv1 protocol if the client
+can accept it.
+Specifying B<--ssl-version> implies B<--ssl>.
=item B<--server-key> I<keyfile>
Date: Mon Jan 1 15:09:18 2007
New Revision: 491679
URL: http://svn.apache.org/viewvc?view=rev&rev=491679
Log:
update perldoc and man pages for new ssl-version options in spamc and spamd
Modified:
spamassassin/trunk/spamc/spamc.pod
spamassassin/trunk/spamd/spamd.raw
Modified: spamassassin/trunk/spamc/spamc.pod
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamc/spamc.pod?view=diff&rev=491679&r1=491678&r2=491679
==============================================================================
--- spamassassin/trunk/spamc/spamc.pod (original)
+++ spamassassin/trunk/spamc/spamc.pod Mon Jan 1 15:09:18 2007
@@ -157,10 +157,14 @@
The size is specified in bytes, as a positive integer greater than 0.
For example, B<-s 500000>.
-=item B<-S>, B<--ssl>
+=item B<-S>, B<--ssl>, B<--ssl>=I<sslversion>
If spamc was built with support for SSL, encrypt data to and from the
spamd process with SSL; spamd must support SSL as well.
+I<sslversion> specifies the SSL protocol version to use, one of
+C<sslv2>, C<sslv3>, C<tlsv1>, or C<sslv23>. The default, C<sslv23>, causes
+spamc to use a SSLv2 hello handshake then negotiate use of SSLv3 or TLSv1
+protocol if the spamd server can accept it.
=item B<-t> I<timeout>, B<--timeout>=I<timeout>
Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?view=diff&rev=491679&r1=491678&r2=491679
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Mon Jan 1 15:09:18 2007
@@ -2440,6 +2440,7 @@
-H [dir], --helper-home-dir[=dir] Specify a different HOME directory
--ssl Run an SSL server
--ssl-port port Listen on port for SSL connections
+ --ssl-version sslversion Specify SSL protocol version to use
--server-key keyfile Specify an SSL keyfile
--server-cert certfile Specify an SSL certificate
--socketpath=path Listen on given UNIX domain socket
@@ -2841,8 +2842,8 @@
=item B<--ssl>
-Accept only SSL connections. The B<IO::Socket::SSL> perl module must be
-installed.
+Accept only SSL connections on the associated port.
+The B<IO::Socket::SSL> perl module must be installed.
If the B<--ssl> switch is used, and B<--ssl-port> is not supplied, then
B<--port> port will be used to accept SSL connections instead of unencrypted
@@ -2855,6 +2856,15 @@
Optionally specifies the port number for the server to listen on for
SSL connections (default: whatever --port uses). See B<--ssl> for
more details.
+
+=item B<--ssl-version>=I<sslversion>
+
+Specify the SSL protocol version to use, one of
+B<sslv2>, B<sslv3>, B<tlsv1>, or B<sslv23>.
+The default, B<sslv23>, is the most flexible, accepting a SSLv2 or higher
+hello handshake, then negotiating use of SSLv3 or TLSv1 protocol if the client
+can accept it.
+Specifying B<--ssl-version> implies B<--ssl>.
=item B<--server-key> I<keyfile>