use asynchronous StartTLS

[openldap] / servers / slapd / oidm.c

diff --git a/servers/slapd/oidm.c b/servers/slapd/oidm.c
index ab0b5a4bfc9aab3ccc12afafc2d3e4fb7d3981b6..8e6bdad4cb7e724a9983c970e6bfac6991bc2551 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-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-2005 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"
@@ -47,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);
@@ -72,21 +76,16 @@ oidm_find(char *oid)
 void
 oidm_destroy()
 {
-
-#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 );
+               LDAP_SLIST_REMOVE_HEAD( &om_list, som_next );
 
                ldap_charray_free(om->som_names);
                free(om->som_oid.bv_val);
                free(om);
                
-               LDAP_SLIST_REMOVE_HEAD( &om_list, som_next );
        }
-#endif
 }
 
 int
@@ -117,11 +116,7 @@ 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;
        }