diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2014-03-24 20:33:02 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2014-03-24 20:33:02 +0000 |
| commit | 2b622a70b3fdb5079dde4b67de8d8930e743b663 (patch) | |
| tree | 7214d2d09c8c9623ba422434a97668e727f3626f /usr.bin/htpasswd | |
| parent | 549508956642dcdcd58f8e8ef9f1f51d1632d149 (diff) | |
sf@ pointed out that the -B flag is already in use by apache's
htpasswd (since version 2.4); change it to -I. The -B flag was not in
use for a long time so this change should not cause too much trouble.
OK sf@, jmc@
no objections from sthen@
"kein problem damit" benno@
Diffstat (limited to 'usr.bin/htpasswd')
| -rw-r--r-- | usr.bin/htpasswd/htpasswd.1 | 10 | ||||
| -rw-r--r-- | usr.bin/htpasswd/htpasswd.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/htpasswd/htpasswd.1 b/usr.bin/htpasswd/htpasswd.1 index 9cef1bf84d0..8ed29bee8ca 100644 --- a/usr.bin/htpasswd/htpasswd.1 +++ b/usr.bin/htpasswd/htpasswd.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: htpasswd.1,v 1.4 2014/03/18 17:47:04 florian Exp $ +.\" $OpenBSD: htpasswd.1,v 1.5 2014/03/24 20:33:01 florian Exp $ .\" .\" Copyright (c) 2014 Florian Obser <florian@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: March 18 2014 $ +.Dd $Mdocdate: March 24 2014 $ .Dt HTPASSWD 1 .Os .Sh NAME @@ -25,7 +25,7 @@ .Op Ar file .Ar login .Nm -.Fl B +.Fl I .Op Ar file .Sh DESCRIPTION .Nm @@ -35,7 +35,7 @@ HTTP daemons such as .Pp The options are as follows: .Bl -tag -width Ds -.It Fl B +.It Fl I Switch to batch mode. .Nm reads exactly one line from standard input and splits it at the first @@ -58,7 +58,7 @@ is written to standard output. If invoked with two arguments .Po or one argument if the -.Fl B +.Fl I flag is used .Pc user authentication diff --git a/usr.bin/htpasswd/htpasswd.c b/usr.bin/htpasswd/htpasswd.c index 02418bcbd65..dc906121f3c 100644 --- a/usr.bin/htpasswd/htpasswd.c +++ b/usr.bin/htpasswd/htpasswd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: htpasswd.c,v 1.9 2014/03/20 15:04:35 florian Exp $ */ +/* $OpenBSD: htpasswd.c,v 1.10 2014/03/24 20:33:01 florian Exp $ */ /* * Copyright (c) 2014 Florian Obser <florian@openbsd.org> * @@ -37,7 +37,7 @@ __dead void usage(void) { fprintf(stderr, "usage:\t%s [file] login\n", __progname); - fprintf(stderr, "\t%s -B [file]\n", __progname); + fprintf(stderr, "\t%s -I [file]\n", __progname); exit(1); } @@ -65,9 +65,9 @@ main(int argc, char** argv) linesize = 0; batch = 0; - while ((c = getopt(argc, argv, "B")) != -1) { + while ((c = getopt(argc, argv, "I")) != -1) { switch (c) { - case 'B': + case 'I': batch++; break; default: |