X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslappasswd.c;h=44751ecbf5e4441cd757113a67a026083f31d7f4;hb=24db207196a453a4f9acdce08593c7e0ed53ce4c;hp=02de9ee93e8bdf1ead9c9a90376b08745166685e;hpb=ad7d644437563ab006e5a2cb14033754ff489c34;p=openldap
diff --git a/servers/slapd/slappasswd.c b/servers/slapd/slappasswd.c
index 02de9ee93e..44751ecbf5 100644
--- a/servers/slapd/slappasswd.c
+++ b/servers/slapd/slappasswd.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
* Portions Copyright 1998-2003 Kurt D. Zeilenga.
* All rights reserved.
*
@@ -37,6 +37,7 @@
#include
#include "ldap_defaults.h"
+#include "slap.h"
static int verbose = 0;
@@ -48,6 +49,7 @@ usage(const char *s)
" -c format\tcrypt(3) salt format\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"
@@ -73,11 +75,12 @@ slappasswd( int argc, char *argv[] )
const char *progname = "slappasswd";
int i;
+ 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 */
@@ -106,10 +109,14 @@ slappasswd( int argc, char *argv[] )
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" );
@@ -121,7 +128,7 @@ slappasswd( int argc, char *argv[] )
} else {
char* p;
- newpw = strdup( optarg );
+ newpw = ch_strdup( optarg );
for( p = optarg; *p != '\0'; p++ ) {
*p = '\0';
@@ -166,7 +173,7 @@ slappasswd( int argc, char *argv[] )
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 )) {
@@ -178,9 +185,8 @@ slappasswd( int argc, char *argv[] )
passwd.bv_val = newpw;
passwd.bv_len = strlen(passwd.bv_val);
} else {
- /* Omit trailing newline so it may be directed to a pwfile */
- printf( "%s", passwd.bv_val );
- return EXIT_SUCCESS;
+ hash = passwd;
+ goto print_pw;
}
lutil_passwd_hash( &passwd, scheme, &hash, &text );
@@ -197,6 +203,7 @@ slappasswd( int argc, char *argv[] )
return EXIT_FAILURE;
}
- printf( "%s\n" , hash.bv_val );
+print_pw:;
+ printf( "%s%s" , hash.bv_val, newline );
return EXIT_SUCCESS;
}