Partially revert prev, redundant.

[openldap] / servers / slapd / ad.c

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index 2366d2b890a3981a7dd412169c008cb7b3709c57..e17aecb9e897cf1a42eef9120c3ad7eb4fd35c57 100644 (file)
--- a/servers/slapd/ad.c
+++ b/servers/slapd/ad.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -963,10 +963,8 @@ str2anlist( AttributeName *an, char *in, const char *brkstr )
        return( an );
 
 reterr:
-       for ( i = 0; an[i].an_name.bv_val; i++ ) {
-               free( an[i].an_name.bv_val );
-       }
-       free( an );
+       anlist_free( an, 1, NULL );
+
        /*
         * overwrites input string
         * on error!
@@ -976,6 +974,24 @@ reterr:
        return NULL;
 }
 
+void
+anlist_free( AttributeName *an, int freename, void *ctx )
+{
+       if ( an == NULL ) {
+               return;
+       }
+
+       if ( freename ) {
+               int     i;
+
+               for ( i = 0; an[i].an_name.bv_val; i++ ) {
+                       ber_memfree_x( an[i].an_name.bv_val, ctx );
+               }
+       }
+
+       ber_memfree_x( an, ctx );
+}
+
 char **anlist2charray_x( AttributeName *an, int dup, void *ctx )
 {
     char **attrs;
@@ -1133,7 +1149,7 @@ file2anlist( AttributeName *an, const char *fname, const char *brkstr )
                }
                an = str2anlist( an, line, brkstr );
                if ( an == NULL )
-                       return NULL;
+                       break;
                lcur = line;
        }
        ch_free( line );