Fix lint in previous commit

[openldap] / servers / slapd / backend.c

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 3d521248240079b75a836446fd1af20514939a92..61bfb2ae0445784647f14e1ec10b7215a096c45d 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* backend.c - routines for dealing with back-end databases */
@@ -410,19 +410,19 @@ int backend_shutdown( Backend *be )
 int backend_destroy(void)
 {
        int i;
+       BackendDB *bd;
 
        /* destroy each backend database */
-       for( i = 0; i < nBackendDB; i++ ) {
-               if ( backendDB[i].bd_info->bi_db_destroy ) {
-                       backendDB[i].bd_info->bi_db_destroy(
-                               &backendDB[i] );
+       for( i = 0, bd = backendDB; i < nBackendDB; i++, bd++ ) {
+               if ( bd->bd_info->bi_db_destroy ) {
+                       bd->bd_info->bi_db_destroy( bd );
                }
-               ber_bvecfree( backendDB[i].be_suffix );
-               ber_bvecfree( backendDB[i].be_nsuffix );
-               free( backendDB[i].be_rootdn.bv_val );
-               free( backendDB[i].be_rootndn.bv_val );
-               free( backendDB[i].be_rootpw.bv_val );
-               acl_destroy( backendDB[i].be_acl, global_acl );
+               ber_bvecfree( bd->be_suffix );
+               ber_bvecfree( bd->be_nsuffix );
+               if ( bd->be_rootdn.bv_val ) free( bd->be_rootdn.bv_val );
+               if ( bd->be_rootndn.bv_val ) free( bd->be_rootndn.bv_val );
+               if ( bd->be_rootpw.bv_val ) free( bd->be_rootpw.bv_val );
+               acl_destroy( bd->be_acl, global_acl );
        }
        free( backendDB );
 
@@ -1049,7 +1049,7 @@ backend_attribute(
        Entry   *target,
        struct berval   *edn,
        AttributeDescription *entry_at,
-       struct berval ***vals
+       BVarray *vals
 )
 {
        if( target == NULL || target->e_nname.bv_len != edn->bv_len ||
@@ -1078,7 +1078,7 @@ Attribute *backend_operational(
        Connection *conn,
        Operation *op,
        Entry *e,
-       struct berval **attrs,
+       AttributeName *attrs,
        int opattrs     )
 {
        Attribute *a = NULL, **ap = &a;