/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
* Portions Copyright 1998-2003 Kurt D. Zeilenga.
* All rights reserved.
*
#include <lutil_sha1.h>
#include "ldap_defaults.h"
+#include "slap.h"
static int verbose = 0;
fprintf(stderr,
"Usage: %s [options]\n"
" -c format\tcrypt(3) salt format\n"
- " -g\n"
+ " -g\t\tgenerate random password\n"
" -h hash\tpassword scheme\n"
+ " -n\t\tomit trailing newline\n"
" -s secret\tnew password\n"
" -u\t\tgenerate RFC2307 values (default)\n"
" -v\t\tincrease verbosity\n"
int
slappasswd( int argc, char *argv[] )
{
- char *cleartext_scheme = "{CLEARTEXT}";
#ifdef LUTIL_SHA1_BYTES
char *default_scheme = "{SSHA}";
#else
const char *progname = "slappasswd";
int i;
- struct berval passwd;
+ char *newline = "\n";
+ struct berval passwd = BER_BVNULL;
struct berval hash;
while( (i = getopt( argc, argv,
- "c:d:gh:s:T:vu" )) != EOF )
+ "c:d:gh:ns:T:vu" )) != EOF )
{
switch (i) {
case 'c': /* crypt salt format */
case 'g': /* new password (generate) */
if ( pwfile != NULL ) {
- fprintf( stderr, "Option -s incompatible with -T\n" );
+ fprintf( stderr, "Option -g incompatible with -T\n" );
return EXIT_FAILURE;
} else if ( newpw != NULL ) {
fprintf( stderr, "New password already provided\n" );
return EXIT_FAILURE;
- } else if ( scheme != default_scheme && strcmp( scheme, cleartext_scheme ) != 0 ) {
- fprintf( stderr, "Option -g incompatible with scheme \"%s\"\n", scheme );
+ } else if ( lutil_passwd_generate( &passwd, 8 )) {
+ fprintf( stderr, "Password generation failed\n" );
return EXIT_FAILURE;
-
- } else {
- struct berval p = BER_BVNULL;
-
- lutil_passwd_generate( &p, 8 );
-
- newpw = p.bv_val;
-
- scheme = cleartext_scheme;
}
break;
case 'h': /* scheme */
- if ( scheme == cleartext_scheme ) {
- if ( strcmp( optarg, cleartext_scheme ) != 0 ) {
- fprintf( stderr, "Option -h incompatible with -g\n" );
- return EXIT_FAILURE;
- }
-
- } else if ( scheme != default_scheme ) {
+ if ( scheme != default_scheme ) {
fprintf( stderr, "Scheme already provided\n" );
return EXIT_FAILURE;
} else {
- scheme = strdup( optarg );
+ scheme = ch_strdup( optarg );
}
break;
+ case 'n':
+ newline = "";
+ break;
+
case 's': /* new password (secret) */
if ( pwfile != NULL ) {
fprintf( stderr, "Option -s incompatible with -T\n" );
} else {
char* p;
- newpw = strdup( optarg );
+ newpw = ch_strdup( optarg );
for( p = optarg; *p != '\0'; p++ ) {
*p = '\0';
if( lutil_get_filed_password( pwfile, &passwd )) {
return EXIT_FAILURE;
}
- } else {
+ } else if ( BER_BVISEMPTY( &passwd )) {
if( newpw == NULL ) {
/* prompt for new password */
char *cknewpw;
- newpw = strdup(getpassphrase("New password: "));
+ newpw = ch_strdup(getpassphrase("New password: "));
cknewpw = getpassphrase("Re-enter new password: ");
if( strcmp( newpw, cknewpw )) {
passwd.bv_val = newpw;
passwd.bv_len = strlen(passwd.bv_val);
+ } else {
+ hash = passwd;
+ goto print_pw;
}
lutil_passwd_hash( &passwd, scheme, &hash, &text );
return EXIT_FAILURE;
}
- printf( "%s\n" , hash.bv_val );
+print_pw:;
+ printf( "%s%s" , hash.bv_val, newline );
return EXIT_SUCCESS;
}