Fix prev commit, cleanup fakeroot entry before freeing

[openldap] / servers / slapd / at.c

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index acdeff290bc7b28662e91ecc7738efadd25e1b9b..715477184ded33f5dbb2528577e70d69ec98b285 100644 (file)
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,16 +27,32 @@
 #include "slap.h"
 
 
-int is_at_syntax(
-       AttributeType *at,
-       const char *oid )
+const char *
+at_syntax(
+       AttributeType   *at )
 {
-       for( ; at != NULL; at = at->sat_sup ) {
-               if( at->sat_syntax_oid ) {
-                       return ( strcmp( at->sat_syntax_oid, oid ) == 0 );
+       for ( ; at != NULL; at = at->sat_sup ) {
+               if ( at->sat_syntax_oid ) {
+                       return at->sat_syntax_oid;
                }
        }
 
+       assert( 0 );
+
+       return NULL;
+}
+
+int
+is_at_syntax(
+       AttributeType   *at,
+       const char      *oid )
+{
+       const char *syn_oid = at_syntax( at );
+
+       if ( syn_oid ) {
+               return strcmp( syn_oid, oid ) == 0;
+       }
+
        return 0;
 }
 
@@ -268,8 +284,14 @@ at_clean( AttributeType *a )
                }
        }
 
-       if ( a->sat_oidmacro ) ldap_memfree( a->sat_oidmacro );
-       if ( a->sat_subtypes ) ldap_memfree( a->sat_subtypes );
+       if ( a->sat_oidmacro ) {
+               ldap_memfree( a->sat_oidmacro );
+               a->sat_oidmacro = NULL;
+       }
+       if ( a->sat_subtypes ) {
+               ldap_memfree( a->sat_subtypes );
+               a->sat_subtypes = NULL;
+       }
 }
 
 static void
@@ -323,7 +345,7 @@ at_next( AttributeType **at )
 {
        assert( at != NULL );
 
-#if 1  /* pedantic check */
+#if 0  /* pedantic check: don't use this */
        {
                AttributeType *tmp = NULL;