X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Ftools%2Fldappasswd.c;h=a0265f4ebdc5fa9b8e7dbc0b48898c7fe9c20d0a;hb=626830b5adf4c048edc3ecd7c5cf48ab1fa8b495;hp=7b14ca03a07de4ff929a895fd58c2ec6c5c018a1;hpb=6939c531700652491f4be4688c6a1f35a1ab8a18;p=openldap

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 7b14ca03a0..a0265f4ebd 100644
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -48,7 +48,8 @@ usage( void )
 }
 
 
-const char options[] = "a:As:S" "Cd:D:e:h:H:InO:p:QR:U:vw:WxX:Y:Z";
+const char options[] = "a:As:S"
+	"Cd:D:e:h:H:InO:p:QR:U:vVw:WxX:Y:Z";
 
 int
 handle_private_option( int i )
@@ -58,9 +59,9 @@ handle_private_option( int i )
 		int		crit;
 		char	*control, *cvalue;
 	case 'E': /* passwd controls */
-		if( version == LDAP_VERSION2 ) {
+		if( protocol == LDAP_VERSION2 ) {
 			fprintf( stderr, "%s: -E incompatible with LDAPv%d\n",
-			         prog, version );
+			         prog, protocol );
 			exit( EXIT_FAILURE );
 		}
 
@@ -126,7 +127,7 @@ main( int argc, char *argv[] )
 	char	*user = NULL;
 
 	LDAP	       *ld = NULL;
-	struct berval bv = {0};
+	struct berval bv = {0, NULL};
 	BerElement  *ber = NULL;
 
 	int id, code = LDAP_OTHER;
@@ -138,7 +139,7 @@ main( int argc, char *argv[] )
 	prog = lutil_progname( "ldappasswd", argc, argv );
 
 	/* LDAPv3 only */
-	version = LDAP_VERSION3;
+	protocol = LDAP_VERSION3;
 
 	tool_args( argc, argv );