summaryrefslogtreecommitdiffstats
path: root/support/htpasswd.c
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2012-10-07 11:10:14 +0200
committerStefan Fritsch <sf@apache.org>2012-10-07 11:10:14 +0200
commit566312f891445678481d3a5cb5050f12fb518f3a (patch)
treed1f0186597c76089b631ae46a2579f380ef021a6 /support/htpasswd.c
parentadd support for bcrypt (diff)
downloadapache2-566312f891445678481d3a5cb5050f12fb518f3a.tar.xz
apache2-566312f891445678481d3a5cb5050f12fb518f3a.zip
Optionally read passwords from stdin
PR: 40243 Submitted by: Adomas Paltanavicius <adomas paltanavicius gmail com>, sf git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1395256 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support/htpasswd.c')
-rw-r--r--support/htpasswd.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/support/htpasswd.c b/support/htpasswd.c
index aed716a0fe..9175a7bc40 100644
--- a/support/htpasswd.c
+++ b/support/htpasswd.c
@@ -92,13 +92,14 @@ static int mkrecord(struct passwd_ctx *ctx, char *user)
static void usage(void)
{
apr_file_printf(errfile, "Usage:" NL
- "\thtpasswd [-cmBdpsD] [-C cost] passwordfile username" NL
+ "\thtpasswd [-cimBdpsD] [-C cost] passwordfile username" NL
"\thtpasswd -b[cmBdpsD] [-C cost] passwordfile username password" NL
NL
- "\thtpasswd -n[mBdps] [-C cost] username" NL
+ "\thtpasswd -n[imBdps] [-C cost] username" NL
"\thtpasswd -nb[mBdps] [-C cost] username password" NL
" -c Create a new file." NL
" -n Don't update file; display results on stdout." NL
+ " -i Read password from stdin without verification (for script usage)" NL
" -m Force MD5 encryption of the password (default)." NL
" -B Force bcrypt encryption of the password (very secure)." NL
" -C Set the computing time used for the bcrypt algorithm" NL