Fix desc not NULL bugs

servers/slapd/compare.c

@@ -98,6 +98,7 @@ do_compare(
 	}
 
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
+	ava.aa_desc = NULL;
 	rc = slap_bv2ad( &desc, &ava.aa_desc, &text );
 	if( rc != LDAP_SUCCESS ) {
 		send_ldap_result( conn, op, rc, NULL,

servers/slapd/filter.c

@@ -372,6 +372,7 @@ get_substring_filter(
 	}
 
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
+	f->f_sub_desc = NULL;
 	rc = slap_bv2ad( &type, &f->f_sub_desc, text );
 
 	ch_free( type.bv_val );

servers/slapd/schema_init.c

@@ -688,10 +688,14 @@ schema_prep( void )
 
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
 	for( i=0; ad_map[i].ssm_type; i++ ) {
-		int rc = slap_str2ad( ad_map[i].ssm_type,
-			(AttributeDescription **)
-				&(((char *) &slap_schema)[ad_map[i].ssm_offset]),
-			&text);
+		int rc;
+
+		AttributeDescription ** adp = (AttributeDescription **)
+			&(((char *) &slap_schema)[ad_map[i].ssm_offset]);
+
+		*adp = NULL;
+
+		rc = slap_str2ad( ad_map[i].ssm_type, adp, &text );
 
 		if( rc != LDAP_SUCCESS ) {
 			fprintf( stderr,