remove a componentCertificate attribute from the organizationalPerson objectclass

[openldap] / servers / slapd / oidm.c

diff --git a/servers/slapd/oidm.c b/servers/slapd/oidm.c
index 4075171d13f18169c89b35fe0c5aedb5d483c0e1..15e5ac61c6127972b64f391f11cd601185859ba5 100644 (file)
--- a/servers/slapd/oidm.c
+++ b/servers/slapd/oidm.c
@@ -1,8 +1,17 @@
-/* schemaparse.c - routines to parse config file objectclass definitions */
+/* oidm.c - object identifier macro routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 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-2004 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"
@@ -15,7 +24,8 @@
 
 #include "slap.h"
 
-static OidMacro *om_list = NULL;
+static LDAP_SLIST_HEAD(OidMacroList, slap_oid_macro) om_list
+       = LDAP_SLIST_HEAD_INITIALIZER(om_list);
 
 /* Replace an OID Macro invocation with its full numeric OID.
  * If the macro is used with "macroname:suffix" append ".suffix"
@@ -31,7 +41,7 @@ oidm_find(char *oid)
                return oid;
        }
 
-    for (om = om_list; om; om=om->som_next) {
+       LDAP_SLIST_FOREACH( om, &om_list, som_next ) {
                char **names = om->som_names;
 
                if( names == NULL ) {
@@ -46,13 +56,8 @@ oidm_find(char *oid)
                                char *tmp = SLAP_MALLOC( om->som_oid.bv_len
                                        + suflen + 1);
                                if( tmp == NULL ) {
-#ifdef NEW_LOGGING
-                                       LDAP_LOG( OPERATION, ERR,
-                                               "oidm_find: SLAP_MALLOC failed", 0, 0, 0 );
-#else
                                        Debug( LDAP_DEBUG_ANY,
                                                "oidm_find: SLAP_MALLOC failed", 0, 0, 0 );
-#endif
                                        return NULL;
                                }
                                strcpy(tmp, om->som_oid.bv_val);
@@ -71,13 +76,15 @@ oidm_find(char *oid)
 void
 oidm_destroy()
 {
-       OidMacro *om, *n;
+       OidMacro *om;
+       while( !LDAP_SLIST_EMPTY( &om_list )) {
+               om = LDAP_SLIST_FIRST( &om_list );
+               LDAP_SLIST_REMOVE_HEAD( &om_list, som_next );
 
-       for (om = om_list; om; om = n) {
-               n = om->som_next;
                ldap_charray_free(om->som_names);
                free(om->som_oid.bv_val);
                free(om);
+               
        }
 }
 
@@ -86,8 +93,7 @@ parse_oidm(
     const char *fname,
     int                lineno,
     int                argc,
-    char       **argv
-)
+    char       **argv )
 {
        char *oid;
        OidMacro *om;
@@ -110,14 +116,11 @@ usage:    fprintf( stderr, "\tObjectIdentifier <name> <oid>\n");
 
        om = (OidMacro *) SLAP_MALLOC( sizeof(OidMacro) );
        if( om == NULL ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, ERR, "parse_oidm: SLAP_MALLOC failed", 0, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY, "parse_oidm: SLAP_MALLOC failed", 0, 0, 0 );
-#endif
                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] );
@@ -133,8 +136,7 @@ usage:      fprintf( stderr, "\tObjectIdentifier <name> <oid>\n");
        }
 
        om->som_oid.bv_len = strlen( om->som_oid.bv_val );
-       om->som_next = om_list;
-       om_list = om;
 
+       LDAP_SLIST_INSERT_HEAD( &om_list, om, som_next );
        return 0;
 }