From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 15 Jun 2000 16:09:36 +0000 (+0000)
Subject: Fix slappasswd
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2637
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8cb40e89d9abf79f76623197ff17372182752747;p=openldap

Fix slappasswd
---

diff --git a/servers/slapd/tools/slappasswd.c b/servers/slapd/tools/slappasswd.c
index b7bedd6cdc..37c32c4e94 100644
--- a/servers/slapd/tools/slappasswd.c
+++ b/servers/slapd/tools/slappasswd.c
@@ -28,7 +28,7 @@ static void
 usage(const char *s)
 {
 	fprintf(stderr,
-		"Usage: %s [options] dn\n"
+		"Usage: %s [options]\n"
 		"  -h hash\tpassword scheme\n"
 		"  -s secret\tnew password\n"
 		"  -v\t\tincrease verbosity\n"
@@ -49,9 +49,6 @@ main( int argc, char *argv[] )
 	struct berval passwd;
 	struct berval *hash = NULL;
 
-	if (argc == 1)
-		usage (argv[0]);
-
 	while( (i = getopt( argc, argv,
 		"d:h:s:v" )) != EOF )
 	{
@@ -87,8 +84,8 @@ main( int argc, char *argv[] )
 	if( newpw == NULL ) {
 		/* prompt for new password */
 		char *cknewpw;
-		newpw = strdup(getpass("New password: "));
-		cknewpw = getpass("Re-enter new password: ");
+		newpw = strdup(getpassphrase("New password: "));
+		cknewpw = getpassphrase("Re-enter new password: ");
 
 		if( strncmp( newpw, cknewpw, strlen(newpw) )) {
 			fprintf( stderr, "passwords do not match\n" );