refine fix to ITS#4315; apply it to back-meta as well

[openldap] / servers / slapd / back-meta / back-meta.h

diff --git a/servers/slapd/back-meta/back-meta.h b/servers/slapd/back-meta/back-meta.h
index 2a260e21f81419b33e0b095c949d37d162b0aa0e..4f27415c37a323e92054fc8b56ebd0857d977213 100644 (file)
--- a/servers/slapd/back-meta/back-meta.h
+++ b/servers/slapd/back-meta/back-meta.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2006 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -82,9 +82,6 @@ typedef struct dncookie {
 #endif
 } dncookie;
 
-/* TODO: allow to define it on a per-target basis */
-#define META_BIND_TIMEOUT      10000
-
 int ldap_back_dn_massage(dncookie *dc, struct berval *dn,
        struct berval *res);
 
@@ -232,6 +229,8 @@ typedef struct metatarget_t {
        int                     mt_version;
        time_t                  mt_network_timeout;
        time_t                  mt_idle_timeout;
+       struct timeval          mt_bind_timeout;
+#define META_BIND_TIMEOUT      10000
        time_t                  mt_timeout[ LDAP_BACK_OP_LAST ];
 } metatarget_t;
 
@@ -276,6 +275,7 @@ typedef struct metainfo_t {
        int                     mi_version;
        time_t                  mi_network_timeout;
        time_t                  mi_idle_timeout;
+       struct timeval          mi_bind_timeout;
        time_t                  mi_timeout[ LDAP_BACK_OP_LAST ];
 } metainfo_t;