#ifdef for slap_auxprop_store

[openldap] / servers / slapd / mr.c

diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c
index bc0a1777f1d30445a47e76c61ea5aac7edb6421b..88a07c7064a97280d6a4e198574f126d3c22360f 100644 (file)
--- a/servers/slapd/mr.c
+++ b/servers/slapd/mr.c
@@ -1,8 +1,17 @@
 /* mr.c - routines to manage matching rule definitions */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -326,14 +335,14 @@ mru_destroy( void )
 
                if ( m->smru_str.bv_val ) {
                        ch_free( m->smru_str.bv_val );
+                       m->smru_str.bv_val = NULL;
                }
                /* memory borrowed from m->smru_mr */
                m->smru_oid = NULL;
                m->smru_names = NULL;
                m->smru_desc = NULL;
 
-               /* free what's left (basically 
-                * smru_mruleuse.mru_applies_oids) */
+               /* free what's left (basically smru_mruleuse.mru_applies_oids) */
                ldap_matchingruleuse_free((LDAPMatchingRuleUse *)m);
        }
 }
@@ -494,10 +503,10 @@ int mr_schema_info( Entry *e )
                Debug( LDAP_DEBUG_TRACE, "Merging mr [%lu] %s\n",
                        mr->smr_str.bv_len, mr->smr_str.bv_val, 0 );
 #endif
+
                nval.bv_val = mr->smr_oid;
                nval.bv_len = strlen(mr->smr_oid);
-               if( attr_merge_one( e, ad_matchingRules, &mr->smr_str, &nval ) )
-               {
+               if( attr_merge_one( e, ad_matchingRules, &mr->smr_str, &nval ) ) {
                        return -1;
                }
        }
@@ -512,7 +521,6 @@ int mru_schema_info( Entry *e )
        struct berval nval;
 
        LDAP_SLIST_FOREACH( mru, &mru_list, smru_next ) {
-
                assert( !( mru->smru_usage & SLAP_MR_HIDE ) );
 
                if ( mru->smru_str.bv_val == NULL ) {
@@ -526,10 +534,10 @@ int mru_schema_info( Entry *e )
                Debug( LDAP_DEBUG_TRACE, "Merging mru [%lu] %s\n",
                        mru->smru_str.bv_len, mru->smru_str.bv_val, 0 );
 #endif
+
                nval.bv_val = mru->smru_oid;
                nval.bv_len = strlen(mru->smru_oid);
-               if( attr_merge_one( e, ad_matchingRuleUse, &mru->smru_str, &nval ) )
-               {
+               if( attr_merge_one( e, ad_matchingRuleUse, &mru->smru_str, &nval ) ) {
                        return -1;
                }
        }