NVALUES: fix a couple of value_find_ex() calls

[openldap] / servers / slapd / oidm.c

diff --git a/servers/slapd/oidm.c b/servers/slapd/oidm.c
index 89895ad6c3b3e0d1d5c9c3278bdbbab495214617..ab0b5a4bfc9aab3ccc12afafc2d3e4fb7d3981b6 100644 (file)
--- a/servers/slapd/oidm.c
+++ b/servers/slapd/oidm.c
@@ -72,8 +72,11 @@ oidm_find(char *oid)
 void
 oidm_destroy()
 {
-       OidMacro *om;
 
+#ifdef SLAP_NVALUES
+       /* FIXME: this causes a malloc debug error */
+#else
+       OidMacro *om;
        while( !LDAP_SLIST_EMPTY( &om_list )) {
                om = LDAP_SLIST_FIRST( &om_list );
 
@@ -83,6 +86,7 @@ oidm_destroy()
                
                LDAP_SLIST_REMOVE_HEAD( &om_list, som_next );
        }
+#endif
 }
 
 int
@@ -90,8 +94,7 @@ parse_oidm(
     const char *fname,
     int                lineno,
     int                argc,
-    char       **argv
-)
+    char       **argv )
 {
        char *oid;
        OidMacro *om;
@@ -122,6 +125,7 @@ usage:      fprintf( stderr, "\tObjectIdentifier <name> <oid>\n");
                return 1;
        }
 
+       LDAP_SLIST_NEXT( om, som_next ) = NULL;
        om->som_names = NULL;
        ldap_charray_add( &om->som_names, argv[1] );
        om->som_oid.bv_val = oidm_find( argv[2] );
@@ -139,6 +143,5 @@ usage:      fprintf( stderr, "\tObjectIdentifier <name> <oid>\n");
        om->som_oid.bv_len = strlen( om->som_oid.bv_val );
 
        LDAP_SLIST_INSERT_HEAD( &om_list, om, som_next );
-
        return 0;
 }