Tweak back-mdb integer types to match libmdb.

[openldap] / servers / slapd / mr.c

diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c
index 8a49f4f6c5751b987f37c9c21fec7c4c28dc9563..3d5b8dd842397b4b960ef4e7036bc21a081a76fe 100644 (file)
--- a/servers/slapd/mr.c
+++ b/servers/slapd/mr.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -145,6 +145,67 @@ mr_insert(
        return 0;
 }
 
+int
+mr_make_syntax_compat_with_mr(
+       Syntax          *syn,
+       MatchingRule    *mr )
+{
+       int             n = 0;
+
+       assert( syn != NULL );
+       assert( mr != NULL );
+
+       if ( mr->smr_compat_syntaxes ) {
+               /* count esisting */
+               for ( n = 0;
+                       mr->smr_compat_syntaxes[ n ];
+                       n++ )
+               {
+                       if ( mr->smr_compat_syntaxes[ n ] == syn ) {
+                               /* already compatible; mmmmh... */
+                               return 1;
+                       }
+               }
+       }
+
+       mr->smr_compat_syntaxes = ch_realloc(
+               mr->smr_compat_syntaxes,
+               sizeof( Syntax * )*(n + 2) );
+       mr->smr_compat_syntaxes[ n ] = syn;
+       mr->smr_compat_syntaxes[ n + 1 ] = NULL;
+
+       return 0;
+}
+
+int
+mr_make_syntax_compat_with_mrs(
+       const char *syntax,
+       char *const *mrs )
+{
+       int     r, rc = 0;
+       Syntax  *syn;
+
+       assert( syntax != NULL );
+       assert( mrs != NULL );
+
+       syn = syn_find( syntax );
+       if ( syn == NULL ) {
+               return -1;
+       }
+
+       for ( r = 0; mrs[ r ] != NULL; r++ ) {
+               MatchingRule    *mr = mr_find( mrs[ r ] );
+               if ( mr == NULL ) {
+                       /* matchingRule not found -- ignore by now */
+                       continue;
+               }
+
+               rc += mr_make_syntax_compat_with_mr( syn, mr );
+       }
+
+       return rc;
+}
+
 int
 mr_add(
     LDAPMatchingRule           *mr,
@@ -316,7 +377,8 @@ matching_rule_use_init( void )
 
        LDAP_SLIST_FOREACH( mr, &mr_list, smr_next ) {
                AttributeType   *at;
-               MatchingRuleUse mru_storage, *mru = &mru_storage;
+               MatchingRuleUse mru_storage = {{ 0 }},
+                               *mru = &mru_storage;
 
                char            **applies_oids = NULL;
 
@@ -341,8 +403,6 @@ matching_rule_use_init( void )
                        continue;
                }
 
-               memset( mru, 0, sizeof( MatchingRuleUse ) );
-
                /*
                 * Note: we're using the same values of the corresponding 
                 * MatchingRule structure; maybe we'd copy them ...