Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

contrib/slapd-modules/allowed/allowed.c

@@ -336,7 +336,7 @@ do_oc:;
 
 		ObjectClass	*oc;
 
-		for ( oc_start( &oc ); oc != NULL; oc_next( &oc ) ) {
+		for ( i = 0, oc_start( &oc ); oc != NULL; oc_next( &oc ) ) {
 			/* we can only add AUXILIARY objectClasses */
 			if ( oc->soc_kind != LDAP_SCHEMA_AUXILIARY ) {
 				continue;