--- servers/slapd/slappasswd.c	2008/02/11 23:26:44	1.5.2.5
+++ servers/slapd/slappasswd.c	2006/05/10 22:12:54	1.6
@@ -1,7 +1,7 @@
-/* $OpenLDAP: pkg/ldap/servers/slapd/slappasswd.c,v 1.5.2.4 2007/08/31 23:14:00 quanah Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/slappasswd.c,v 1.5 2006/01/03 22:12:16 kurt Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * All rights reserved.
  *
@@ -37,7 +37,6 @@
 #include <lutil_sha1.h>
 
 #include "ldap_defaults.h"
-#include "slap.h"
 
 static int	verbose = 0;
 
@@ -47,9 +46,8 @@ usage(const char *s)
 	fprintf(stderr,
 		"Usage: %s [options]\n"
 		"  -c format\tcrypt(3) salt format\n"
-		"  -g\t\tgenerate random password\n"
+		"  -g\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"
@@ -62,6 +60,7 @@ usage(const char *s)
 int
 slappasswd( int argc, char *argv[] )
 {
+	char	*cleartext_scheme = "{CLEARTEXT}";
 #ifdef LUTIL_SHA1_BYTES
 	char	*default_scheme = "{SSHA}";
 #else
@@ -75,12 +74,11 @@ slappasswd( int argc, char *argv[] )
 	const char *progname = "slappasswd";
 
 	int		i;
-	char		*newline = "\n";
-	struct berval passwd = BER_BVNULL;
+	struct berval passwd;
 	struct berval hash;
 
 	while( (i = getopt( argc, argv,
-		"c:d:gh:ns:T:vu" )) != EOF )
+		"c:d:gh:s:T:vu" )) != EOF )
 	{
 		switch (i) {
 		case 'c':	/* crypt salt format */
@@ -90,33 +88,44 @@ slappasswd( int argc, char *argv[] )
 
 		case 'g':	/* new password (generate) */
 			if ( pwfile != NULL ) {
-				fprintf( stderr, "Option -g incompatible with -T\n" );
+				fprintf( stderr, "Option -s incompatible with -T\n" );
 				return EXIT_FAILURE;
 
 			} else if ( newpw != NULL ) {
 				fprintf( stderr, "New password already provided\n" );
 				return EXIT_FAILURE;
 
-			} else if ( lutil_passwd_generate( &passwd, 8 )) {
-				fprintf( stderr, "Password generation failed\n" );
+			} else if ( scheme != default_scheme && strcmp( scheme, cleartext_scheme ) != 0 ) {
+				fprintf( stderr, "Option -g incompatible with scheme \"%s\"\n", scheme );
 				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 != default_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 ) {
 				fprintf( stderr, "Scheme already provided\n" );
 				return EXIT_FAILURE;
 
 			} else {
-				scheme = ch_strdup( optarg );
+				scheme = strdup( optarg );
 			}
 			break;
 
-		case 'n':
-			newline = "";
-			break;
-
 		case 's':	/* new password (secret) */
 			if ( pwfile != NULL ) {
 				fprintf( stderr, "Option -s incompatible with -T\n" );
@@ -128,7 +137,7 @@ slappasswd( int argc, char *argv[] )
 
 			} else {
 				char* p;
-				newpw = ch_strdup( optarg );
+				newpw = strdup( optarg );
 
 				for( p = optarg; *p != '\0'; p++ ) {
 					*p = '\0';
@@ -169,11 +178,11 @@ slappasswd( int argc, char *argv[] )
 		if( lutil_get_filed_password( pwfile, &passwd )) {
 			return EXIT_FAILURE;
 		}
-	} else if ( BER_BVISEMPTY( &passwd )) {
+	} else {
 		if( newpw == NULL ) {
 			/* prompt for new password */
 			char *cknewpw;
-			newpw = ch_strdup(getpassphrase("New password: "));
+			newpw = strdup(getpassphrase("New password: "));
 			cknewpw = getpassphrase("Re-enter new password: ");
 	
 			if( strcmp( newpw, cknewpw )) {
@@ -184,9 +193,6 @@ 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 );
@@ -203,7 +209,6 @@ slappasswd( int argc, char *argv[] )
 		return EXIT_FAILURE;
 	}
 
-print_pw:;
-	printf( "%s%s" , hash.bv_val, newline );
+	printf( "%s\n" , hash.bv_val );
 	return EXIT_SUCCESS;
 }