$NetBSD: patch-aa,v 1.3 2012/03/22 14:15:32 taca Exp $

--- man/poppassd.8.orig	2011-05-30 19:13:39.000000000 +0000
+++ man/poppassd.8
@@ -6,33 +6,36 @@
 .\" See License.txt file for terms and conditions for modification and
 .\" redistribution.
 .\"
-.TH POPAUTH 8
+.TH POPPASSD 8
 .SH NAME
 poppassd \-\- password-changing daemon
 .SH SYNOPSIS
 .B poppassd
 [
-.B \-\?
+.B \-h
 ] [
 .B \-d
 ] [
+.B \-o
+] [
 .BI \-l " tls-usage"
 ]
+] [
+.B \-P
+]
 .if n .ti +9n
 [
 .B \-p
-[
 .I passwd-path
-]
 ] [
 .B \-R
+] [
+.B \-S
 ]
 .if n .ti +9n
 [
 .B \-s
-[
 .I smbpasswd-path
-]
 ] [
 .B \-v
 ]
@@ -58,7 +61,7 @@ programs.
 .PP
 .SH OPTIONS
 .TP
-.B \-\?
+.B \-h
 Prints a summary of options and exits.
 .TP
 .B \-d
@@ -69,6 +72,14 @@ the default log facility is
 but can be changed using the
 .I \-y option.
 .TP
+.B \-o
+Report authentication error after "PASS" command.  
+Without this option, authentication error would report 
+after "NEWPASS" command.
+This is compatible behavior as old
+.I  poppass
+daemon.
+.TP
 .B \-l " tls-usage"
 Sets TLS/SSL handling.  Must have compiled with OpenSSL or SSL Plus.
 
@@ -83,27 +94,37 @@ client to attempt TLS/SSL negotiation af
 Causes Qpopper to attempt TLS negotiation when a client first connects.
 This is for alternate-port support.
 .TP
-.B \-p " [ " passwd-path " ]"
+.B \-P
+Instructs
+.I poppassd
+to change the system password (which is the default).
+.TP
+.B \-p passwd-path
 Instructs
 .I poppassd
-to change the system password (which is the default) and optionally
-specifies the path to the executable to use.  The default is /usr/bin/passwd.
+to change the system password (which is the default) and specifies 
+the path to the executable to use.  The default is /usr/bin/passwd.
 .TP
 .B \-R
 Disables the reverse DNS lookup normally done on the client IP address.
 .TP
-.B \-s " [ " smbpasswd-path " ]"
+.B \-S
 Instructs
 .I poppassd
-to change the smb password and optionally
-specifies the path to the executable to use.  The default is /usr/bin/smbpasswd.
+to change the smb password.
 If this option is used, 
 .I poppassd
 by default does not also change the system password.  To change both, use this
 option and the
-.I \-p
+.I \-P
 option.
 .TP
+.B \-s smbpasswd-path
+Instructs
+.I poppassd
+to change the smb password and specifies the path to the executable 
+to use.  The default is @PREFIX@/bin/smbpasswd.
+.TP
 .BI \-t " tracefile"
 Turns on debug tracing, and causes all trace and log output to be
 written to the file specified as
@@ -125,7 +146,7 @@ through
 .TP
 .B /usr/bin/passwd password-change program
 .TP
-.B /usr/bin/smbpasswd smb password-change program
+.B @PREFIX@/bin/smbpasswd smb password-change program
 
 .SH SEE ALSO
 popper(8), popauth(8), inetd(8), inetd.conf(4)