From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 25 Sep 1999 16:16:05 +0000 (+0000)
Subject: Fix -c vs -H typo (ITS#154)
X-Git-Tag: OPENLDAP_REL_ENG_1_2_8~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=964886ee5ccadf8a813c18693e5b2fce915fdcaf;p=thirdparty%2Fopenldap.git

Fix -c vs -H typo (ITS#154)
---

diff --git a/CHANGES b/CHANGES
index d7fe6ae829..cb98f1ff24 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ Changes included in OpenLDAP 1.2 Release Engineering
 	Fixed slapd li_nextid_file uninitialized bug
 	Fixed -lldap templates y2k bug (ITS#294)
 	Fixed ldbm db_appinit to use u_int32_t instead of int (ITS#295)
+	Documentation
+		ldappasswd fix -c vs -H typo (ITS#154)
 
 Changes included in OpenLDAP 1.2.7
 	CVS Tag: OPENLDAP_REL_ENG_1_2_7
diff --git a/doc/man/man1/ldappasswd.1 b/doc/man/man1/ldappasswd.1
index b56399fa1e..3a79ec50c1 100644
--- a/doc/man/man1/ldappasswd.1
+++ b/doc/man/man1/ldappasswd.1
@@ -76,10 +76,6 @@ Specify the LDAP attribute to change. The default is "userPassword".
 Use \fIsearchbase\fP as the starting point for the search instead of
 the default.
 .TP
-.B \-c \fInone\fR\||\|\fIcrypt\fR\||\|\fImd5\fR\||\|\fIsmd5\fR\||\|\fIsha\fR\||\|\fIssha
-Specify the hashing algorithm used to store the password. The default is
-.IR crypt .
-.TP
 .BI \-D \ binddn
 Use \fIbinddn\fP to bind to the X.500 directory. \fIbinddn\fP should be
 a string-represented DN as defined in RFC 1779.
@@ -94,6 +90,10 @@ Auto-generate passwords of length \fIpwlen\fR.
 Passwords will be displayed when using verbose,
 .BR -vvv .
 .TP
+.B \-H \fInone\fR\||\|\fIcrypt\fR\||\|\fImd5\fR\||\|\fIsmd5\fR\||\|\fIsha\fR\||\|\fIssha
+Specify the hashing algorithm used to store the password. The default is
+.IR crypt .
+.TP
 .BI \-h \ ldaphost
 Specify an alternate host on which the ldap server is running.
 .TP
diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index d8f72c4cd8..daf307d360 100644
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -34,9 +34,9 @@ value_add_fast(
 		    *maxvals * sizeof(struct berval *) );
 	}
 
-	for ( i = 0, j = 0; i < naddvals; i++, j++ ) {
+	for ( i = 0, j = 0; i < naddvals; i++ ) {
 		if ( addvals[i]->bv_len > 0 ) {
-			(*vals)[nvals + j] = ber_bvdup( addvals[i] );
+			(*vals)[nvals + j++] = ber_bvdup( addvals[i] );
 		}
 	}
 	(*vals)[nvals + j] = NULL;