X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslappasswd.c;h=44751ecbf5e4441cd757113a67a026083f31d7f4;hb=24db207196a453a4f9acdce08593c7e0ed53ce4c;hp=0d18eadf785e6308c3aa0d94b4a2db700f380e62;hpb=7cc29d2547be2e3a47403c4b16c4c5ce6e22a221;p=openldap

diff --git a/servers/slapd/slappasswd.c b/servers/slapd/slappasswd.c
index 0d18eadf78..44751ecbf5 100644
--- a/servers/slapd/slappasswd.c
+++ b/servers/slapd/slappasswd.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * 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 <lutil_sha1.h>
 
 #include "ldap_defaults.h"
+#include "slap.h"
 
 static int	verbose = 0;
 
@@ -46,8 +47,9 @@ usage(const char *s)
 	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"
@@ -60,7 +62,6 @@ usage(const char *s)
 int
 slappasswd( int argc, char *argv[] )
 {
-	char	*cleartext_scheme = "{CLEARTEXT}";
 #ifdef LUTIL_SHA1_BYTES
 	char	*default_scheme = "{SSHA}";
 #else
@@ -74,11 +75,12 @@ slappasswd( int argc, char *argv[] )
 	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 */
@@ -88,44 +90,33 @@ slappasswd( int argc, char *argv[] )
 
 		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" );
@@ -137,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';
@@ -178,11 +169,11 @@ slappasswd( int argc, char *argv[] )
 		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 )) {
@@ -193,6 +184,9 @@ slappasswd( int argc, char *argv[] )
 
 		passwd.bv_val = newpw;
 		passwd.bv_len = strlen(passwd.bv_val);
+	} else {
+		hash = passwd;
+		goto print_pw;
 	}
 
 	lutil_passwd_hash( &passwd, scheme, &hash, &text );
@@ -209,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;
 }