Fix prev commit

[openldap] / servers / slapd / oidm.c

diff --git a/servers/slapd/oidm.c b/servers/slapd/oidm.c
index 89895ad6c3b3e0d1d5c9c3278bdbbab495214617..b866af63a8f0b765977cced694170e0ac0590def 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-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"
@@ -73,15 +82,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 );
        }
 }
 
@@ -90,8 +98,7 @@ parse_oidm(
     const char *fname,
     int                lineno,
     int                argc,
-    char       **argv
-)
+    char       **argv )
 {
        char *oid;
        OidMacro *om;
@@ -122,6 +129,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 +147,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;
 }