X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Ftools%2Fldappasswd.c;h=b0cdfb6dea4f8d95883831cfb412320d78be8b8e;hb=fd4b8ba0cd8c1aedb91837d36cfaafac3a64a735;hp=cf49fa678a53c3bb4bb70f72df277f16c919d4d9;hpb=e366aefffc3c1948b3e301adfd3542d74a3bceab;p=openldap

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index cf49fa678a..b0cdfb6dea 100644
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -154,33 +154,33 @@ main( int argc, char *argv[] )
 	    break;
 	case 'D':	/* bind DN */
 		if( binddn != NULL ) {
-			fprintf( stderr, "%s: -D previously specified\n" );
+			fprintf( stderr, "%s: -D previously specified\n", prog );
 			return EXIT_FAILURE;
 		}
 	    binddn = strdup( optarg );
 	    break;
 	case 'h':	/* ldap host */
 		if( ldapuri != NULL ) {
-			fprintf( stderr, "%s: -h incompatible with -H\n" );
+			fprintf( stderr, "%s: -h incompatible with -H\n", prog );
 			return EXIT_FAILURE;
 		}
 		if( ldaphost != NULL ) {
-			fprintf( stderr, "%s: -h previously specified\n" );
+			fprintf( stderr, "%s: -h previously specified\n", prog );
 			return EXIT_FAILURE;
 		}
 	    ldaphost = strdup( optarg );
 	    break;
 	case 'H':	/* ldap URI */
 		if( ldaphost != NULL ) {
-			fprintf( stderr, "%s: -H incompatible with -h\n" );
+			fprintf( stderr, "%s: -H incompatible with -h\n", prog );
 			return EXIT_FAILURE;
 		}
 		if( ldapport ) {
-			fprintf( stderr, "%s: -H incompatible with -p\n" );
+			fprintf( stderr, "%s: -H incompatible with -p\n", prog );
 			return EXIT_FAILURE;
 		}
 		if( ldapuri != NULL ) {
-			fprintf( stderr, "%s: -H previously specified\n" );
+			fprintf( stderr, "%s: -H previously specified\n", prog );
 			return EXIT_FAILURE;
 		}
 	    ldapuri = strdup( optarg );
@@ -262,7 +262,7 @@ main( int argc, char *argv[] )
 	case 'O':
 #ifdef HAVE_CYRUS_SASL
 		if( sasl_secprops != NULL ) {
-			fprintf( stderr, "%s: -O previously specified\n" );
+			fprintf( stderr, "%s: -O previously specified\n", prog );
 			return EXIT_FAILURE;
 		}
 		if( version == LDAP_VERSION2 ) {
@@ -286,7 +286,7 @@ main( int argc, char *argv[] )
 		break;
 	case 'p':
 		if( ldapport ) {
-			fprintf( stderr, "%s: -p previously specified\n" );
+			fprintf( stderr, "%s: -p previously specified\n", prog );
 			return EXIT_FAILURE;
 		}
 	    ldapport = atoi( optarg );
@@ -340,7 +340,7 @@ main( int argc, char *argv[] )
 	case 'R':
 #ifdef HAVE_CYRUS_SASL
 		if( sasl_realm != NULL ) {
-			fprintf( stderr, "%s: -R previously specified\n" );
+			fprintf( stderr, "%s: -R previously specified\n", prog );
 			return EXIT_FAILURE;
 		}
 		if( version == LDAP_VERSION2 ) {
@@ -366,7 +366,7 @@ main( int argc, char *argv[] )
 	case 'U':
 #ifdef HAVE_CYRUS_SASL
 		if( sasl_authc_id != NULL ) {
-			fprintf( stderr, "%s: -U previously specified\n" );
+			fprintf( stderr, "%s: -U previously specified\n", prog );
 			return EXIT_FAILURE;
 		}
 		if( version == LDAP_VERSION2 ) {
@@ -409,7 +409,7 @@ main( int argc, char *argv[] )
 	case 'Y':
 #ifdef HAVE_CYRUS_SASL
 		if( sasl_mech != NULL ) {
-			fprintf( stderr, "%s: -Y previously specified\n" );
+			fprintf( stderr, "%s: -Y previously specified\n", prog );
 			return EXIT_FAILURE;
 		}
 		if( version == LDAP_VERSION2 ) {
@@ -441,7 +441,7 @@ main( int argc, char *argv[] )
 	case 'X':
 #ifdef HAVE_CYRUS_SASL
 		if( sasl_authz_id != NULL ) {
-			fprintf( stderr, "%s: -X previously specified\n" );
+			fprintf( stderr, "%s: -X previously specified\n", prog );
 			return EXIT_FAILURE;
 		}
 		if( version == LDAP_VERSION2 ) {
@@ -481,7 +481,7 @@ main( int argc, char *argv[] )
 
 
 		default:
-			fprintf( stderr, "%s: unrecongized option -%c\n",
+			fprintf( stderr, "%s: unrecognized option -%c\n",
 				prog, optopt );
 			usage (argv[0]);
 		}
@@ -533,7 +533,9 @@ main( int argc, char *argv[] )
 
 	if (want_bindpw && passwd.bv_val == NULL ) {
 		/* handle bind password */
-		fprintf( stderr, "Bind DN: %s\n", binddn );
+		if( binddn != NULL ) {
+			fprintf( stderr, "Bind DN: %s\n", binddn );
+		}
 		passwd.bv_val = strdup( getpassphrase("Enter bind password: "));
 		passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
 	}