Add '-n' option to make htpasswd send user:pw result to

	stdout instead of fiddling with a text file.

Reviewed by:	Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85294 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 44 insertions, 5 deletions

diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1
index c8e8891951..9497c75b9e 100644
--- a/docs/man/htpasswd.1
+++ b/docs/man/htpasswd.1
@@ -1,4 +1,4 @@
-.TH htpasswd 1 "February 1997"
+.TH htpasswd 1 "May 2000"
 .\" The Apache Software License, Version 1.1
 .\"
 .\" Copyright (c) 2000 The Apache Software Foundation.  All rights
@@ -70,13 +70,43 @@ htpasswd \- Create and update user authentication files
 ] 
 [
 .B \-m
+|
 .B \-d
+|
 .B \-p
+|
 .B \-s
 ] 
 .I passwdfile
 .I username
 .I password
+.br
+.B htpasswd 
+.B \-n
+[
+.B \-m
+|
+.B \-d
+|
+.B \-s
+|
+.B \-p
+] 
+.I username
+.br
+.B htpasswd
+.B \-nb
+[
+.B \-m
+|
+.B \-d
+|
+.B \-s
+|
+.B \-p
+] 
+.I username
+.I password
 .SH DESCRIPTION
 .B htpasswd
 is used to create and update the flat-files used to store
@@ -92,8 +122,9 @@ Resources available from the
 Apache web server can be restricted to just the users listed
 in the files created by 
 .B htpasswd.
-This program can only be used
-when the usernames are stored in a flat-file. To use a
+This program can only manage usernames and passwords
+stored in a flat-file. It can encrypt and display password information
+for use in other types of data stores, though.  To use a
 DBM database see 
 \fBdbmmanage\fP.
 .PP
@@ -119,14 +150,22 @@ extreme care, since the password is clearly visible on the command
 line.\fP
 .IP \-c 
 Create the \fIpasswdfile\fP. If \fIpasswdfile\fP already exists, it
-is rewritten and truncated.
+is rewritten and truncated.  This option cannot be combined with
+the \fB-n\fP option.
+.IP \-n
+Display the results on standard output rather than updating a file.
+This is useful for generating password records acceptable to Apache
+for inclusion in non-text data stores.  This option changes the
+syntax of the command line, since the \fIpasswdfile\fP argument
+(usually the first one) is omitted.  It cannot be combined with
+the \fB-c\fP option.
 .IP \-m 
 Use MD5 encryption for passwords. On Windows and TPF, this is the default.
 .IP \-d
 Use crypt() encryption for passwords. The default on all platforms but
 Windows and TPF. Though possibly supported by
 .B htpasswd
-onm all platforms, it is not supported by the
+on all platforms, it is not supported by the
 .B httpd
 server on Windows and TPF.
 .IP \-s