ITS#5860 - more for entry cache counts

[openldap] / servers / slapd / back-ldap / init.c

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index d9a4ff61c4250aca3d77f24a1a85a48c428c4e5a..6c9979bd508e2781e2b8a763ca2847d95332628b 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2007 The OpenLDAP Foundation.
+ * Copyright 2003-2009 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -29,8 +29,19 @@
 #include <ac/socket.h>
 
 #include "slap.h"
+#include "config.h"
 #include "back-ldap.h"
 
+static const ldap_extra_t ldap_extra = {
+       ldap_back_proxy_authz_ctrl,
+       ldap_back_controls_free,
+       slap_idassert_authzfrom_parse_cf,
+       slap_idassert_parse_cf,
+       slap_retry_info_destroy,
+       slap_retry_info_parse,
+       slap_retry_info_unparse
+};
+
 int
 ldap_back_open( BackendInfo    *bi )
 {
@@ -51,7 +62,10 @@ ldap_back_initialize( BackendInfo *bi )
                 * and the entryTtl attribute */
                SLAP_BFLAG_DYNAMIC |
 #endif /* LDAP_DYNAMIC_OBJECTS */
-               0;
+
+               /* back-ldap recognizes RFC4525 increment;
+                * let the remote server complain, if needed (ITS#5912) */
+               SLAP_BFLAG_INCREMENT;
 
        bi->bi_open = ldap_back_open;
        bi->bi_config = 0;
@@ -82,6 +96,8 @@ ldap_back_initialize( BackendInfo *bi )
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = ldap_back_conn_destroy;
 
+       bi->bi_extra = (void *)&ldap_extra;
+
        rc = chain_initialize();
        if ( rc ) {
                return rc;
@@ -98,7 +114,7 @@ ldap_back_initialize( BackendInfo *bi )
 }
 
 int
-ldap_back_db_init( Backend *be )
+ldap_back_db_init( Backend *be, ConfigReply *cr )
 {
        ldapinfo_t      *li;
        int             rc;
@@ -168,7 +184,7 @@ ldap_back_db_init( Backend *be )
 }
 
 int
-ldap_back_db_open( BackendDB *be )
+ldap_back_db_open( BackendDB *be, ConfigReply *cr )
 {
        ldapinfo_t      *li = (ldapinfo_t *)be->be_private;
 
@@ -220,14 +236,10 @@ ldap_back_db_open( BackendDB *be )
        if ( rc != 0 ) {
                /* ignore by now */
                rc = 0;
-#if 0
-               goto fail;
-#endif
        }
 
        li->li_flags |= LDAP_BACK_F_ISOPEN;
 
-fail:;
        return rc;
 }
 
@@ -255,7 +267,7 @@ ldap_back_conn_free( void *v_lc )
 }
 
 int
-ldap_back_db_close( Backend *be )
+ldap_back_db_close( Backend *be, ConfigReply *cr )
 {
        int             rc = 0;
 
@@ -267,7 +279,7 @@ ldap_back_db_close( Backend *be )
 }
 
 int
-ldap_back_db_destroy( Backend *be )
+ldap_back_db_destroy( Backend *be, ConfigReply *cr )
 {
        if ( be->be_private ) {
                ldapinfo_t      *li = ( ldapinfo_t * )be->be_private;