/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
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"
+ " -c format\tcrypt(3) salt format\n"
+ " -u\t\tgenerate RFC2307 values (default)\n"
" -v\t\tincrease verbosity\n"
, s );
int
main( int argc, char *argv[] )
{
- int rc;
char *scheme = "{SSHA}";
char *newpw = NULL;
int i;
- int version = -1;
struct berval passwd;
struct berval *hash = NULL;
- if (argc == 1)
- usage (argv[0]);
-
while( (i = getopt( argc, argv,
- "d:h:s:v" )) != EOF )
+ "c:d:h:s:vu" )) != EOF )
{
switch (i) {
+ case 'c': /* crypt salt format */
+ scheme = "{CRYPT}";
+ lutil_salt_format( optarg );
+ break;
+
case 'h': /* scheme */
- scheme = strdup (optarg);
+ scheme = strdup( optarg );
+ break;
case 's': /* new password (secret) */
- newpw = strdup (optarg);
-
{
char* p;
+ newpw = strdup( optarg );
- for( p = optarg; *p == '\0'; p++ ) {
- *p = '*';
+ for( p = optarg; *p != '\0'; p++ ) {
+ *p = '\0';
}
- }
+
+ } break;
+
+ case 'u': /* RFC2307 userPassword */
break;
case 'v': /* verbose */
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" );
+ if( strcmp( newpw, cknewpw )) {
+ fprintf( stderr, "Password values do not match\n" );
return EXIT_FAILURE;
}
}
}
if( lutil_passwd( hash, &passwd, NULL ) ) {
- fprintf( stderr, "Password verificaiton failed.\n");
+ fprintf( stderr, "Password verification failed.\n");
return EXIT_FAILURE;
}