add sasl and add some more text to a few options

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14047 ec53bebd-3082-4978-b11e-865c3cabbd6b

appl/popper/popper.8

@@ -1,4 +1,4 @@
-.\" Copyright (c) 2001 - 2003 Kungliga Tekniska H<>gskolan
+.\" Copyright (c) 2001 - 2004 Kungliga Tekniska H<>gskolan
 .\" (Royal Institute of Technology, Stockholm, Sweden). 
 .\" All rights reserved. 
 .\"
@@ -31,7 +31,7 @@
 .\" 
 .\" $Id$
 .\"
-.Dd April 16, 2003
+.Dd July 14, 2004
 .Dt POPPER 8
 .Os HEIMDAL
 .Sh NAME
@@ -41,7 +41,7 @@ POP3 server
 .Sh SYNOPSIS
 .Nm
 .Op Fl k
-.Op Fl a Ar none Ns \*(Ba Ns otp
+.Op Fl a Ar plaintext Ns \*(Ba Ns Ar otp Ns \*(Ba Ns Ar sasl
 .Op Fl t Ar file
 .Op Fl T Ar seconds
 .Op Fl d
@@ -52,55 +52,38 @@ POP3 server
 .Nm
 serves mail via the Post Office Protocol.  Supported options include:
 .Bl -tag -width Ds
-.It Xo
+.It Fl a Ar plaintext Ns \*(Ba Ns Ar otp Ns \*(Ba Ns Ar sasl
-.Fl a Ar none Ns \*(Ba Ns otp ,
+Tells
-.Fl -auth-mode= Ns Ar none Ns \*(Ba Ns otp
-.Xc
-tells
 .Nm
-what authentication modes are acceptable, passing
+which authentication mode is acceptable, 
+.Ar sasl
+enables SASL (RFC2222),  and
 .Ar otp
-disables clear text passwords. Otp doesn't disable Kerberos
+enables OTP (RFC1938) authentication. Both disable plaintext passwords.
-authentication, only cleartext passwords.
+.It Fl -address-log= Ns Pa file
-.It Xo
+Logs the addresses (along with a timestamp) of all clients to the
-.Fl -address-log= Ns Pa file
+specified file. This can be used to implement POP-before-SMTP
-.Xc
+authentication.
-logs the addresses of all clients to the specified file
+.It Fl d
-.It Xo
+Enables more verbose log messages.
-.Fl d ,
+.It Fl i
-.Fl -debug
+When not started by inetd, this flag tells
-.Xc
-enables more verbose log messages
-.It Xo
-.Fl i ,
-.Fl -interactive
-.Xc
-when not started by inetd, this flag tells
 .Nm
-that it has to create a socket by itself
+that it has to create a socket by itself.
-.It Xo
+.It Fl k
-.Fl k ,
+Tells
-.Fl -kerberos
-.Xc
-tells
 .Nm
-to use the Kerberos for authentication.
+to use Kerberos for authentication. This is the traditional way of
-.It Xo
+doing Kerberos authentication, and is normally done on a separate port
-.Fl p Ar port ,
+(as it doesn't follow RFC1939), and should be used instead of using
-.Fl -port= Ns Ar port
+SASL.
-.Xc
+.It Fl p Ar port
-port to listen to, in combination with
+Port to listen to, in combination with
-.Fl i
+.Fl i .
-.It Xo
+.It Fl t Ar file
-.Fl t Ar file ,
+Trace all commands to file.
-.Fl -trace-file= Ns Ar file
+.It Fl T Ar seconds
-.Xc
+Set timeout to something other than the default of 120 seconds.
-trace all commands to file
-.It Xo
-.Fl T Ar seconds ,
-.Fl -timeout= Ns Ar seconds
-.Xc
-set timeout to something other than the default of 120 seconds
 .El
 .\".Sh ENVIRONMENT
 .\".Sh FILES