X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Foidm.c;h=15e5ac61c6127972b64f391f11cd601185859ba5;hb=20965abe9c5bb80d79e5ad791cd2b59ec60259b5;hp=05d8e1fb0727266e7116d24852a67683ec595581;hpb=dd66e6e9292c1a250a89865d691f836003d08517;p=openldap
diff --git a/servers/slapd/oidm.c b/servers/slapd/oidm.c
index 05d8e1fb07..15e5ac61c6 100644
--- 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 .
+ *
+ * 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
+ * .
*/
#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);
@@ -73,15 +77,14 @@ void
oidm_destroy()
{
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 );
}
}
@@ -113,11 +116,7 @@ usage: fprintf( stderr, "\tObjectIdentifier \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;
}