>Number:         26780
>Category:       bin
>Synopsis:       sync usage and manpage options with recent SHA1 additions
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bin-bug-people
>State:          open
>Class:          doc-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Aug 28 03:17:01 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jeff Ito
>Release:        NetBSD 2.0G
>Organization:
>Environment:
NetBSD netbsd 2.0G NetBSD 2.0G (LAB) #13: Fri Aug  6 12:31:55 EDT 2004
>Description:
Sync usage and manpage options

>How-To-Repeat:
n/a
>Fix:
Index: pwhash.1
===================================================================
RCS file: /cvs/nbsd/src/usr.bin/pwhash/pwhash.1,v
retrieving revision 1.2
diff -u -r1.2 pwhash.1
--- pwhash.1    2 Oct 2002 07:35:29 -0000       1.2
+++ pwhash.1    28 Aug 2004 03:14:33 -0000
@@ -36,6 +36,7 @@
 .Op Fl k
 .Op Fl m
 .Op Fl p | Ar string
+.Op Fl S Ar rounds
 .Op Fl s Ar salt
 .Sh DESCRIPTION
 .Nm
@@ -59,6 +60,9 @@
 Encrypt the string using MD5.
 .It Fl p
 Prompt for a single string with echo turned off.
+.It Fl S Ar rounds
+Encrypt the string using SHA1 hashing with the specified
+.Ar rounds .
 .It Fl s Ar salt
 Encrypt the string using DES, with the specified
 .Ar salt .
Index: pwhash.c
===================================================================
RCS file: /cvs/nbsd/src/usr.bin/pwhash/pwhash.c,v
retrieving revision 1.6
diff -u -r1.6 pwhash.c
--- pwhash.c    2 Jul 2004 00:05:23 -0000       1.6
+++ pwhash.c    28 Aug 2004 03:14:33 -0000
@@ -60,8 +60,8 @@
 {

        (void)fprintf(stderr,
-           "usage: %s [-b rounds] [-k] [-m] [-S rounds] [-s salt] [-p | string]\n",
-           getprogname());
+           "usage: %s [-b rounds] [-k] [-m] [-p | string] [-S rounds] [-s salt]\n"
+           , getprogname());
        exit(1);
 }
>Release-Note:
>Audit-Trail:
>Unformatted: