Fix prev commit, return generated passwd

[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 a81767eb3f6902c758069e15820b823f5caf005f..cfa95ea1f7b2f291245f14fe1bbc2377611eac0a 100644 (file)
--- a/servers/slapd/back-meta/back-meta.h
+++ b/servers/slapd/back-meta/back-meta.h
@@ -1,7 +1,24 @@
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1999-2003 The OpenLDAP Foundation.
+ * All rights reserved.
  *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by the Howard Chu for inclusion
+ * in OpenLDAP Software and subsequently enhanced by Pierangelo
+ * Masarati.
+ */
+/* This is an altered version */
+/*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
  *
  * Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
@@ -125,10 +142,13 @@ struct metatarget {
        struct berval           pseudorootdn;
        struct berval           pseudorootpw;
 
+#if 0
        struct rewrite_info     *rwinfo;
 
        struct ldapmap          oc_map;
        struct ldapmap          at_map;
+#endif
+       struct ldaprwmap        rwmap;
 };
 
 struct metadncache {
@@ -143,14 +163,13 @@ struct metadncache {
 struct metainfo {
        int                     ntargets;
        int                     defaulttarget;
+       int                     network_timeout;
 #define META_DEFAULT_TARGET_NONE       -1
        struct metatarget       **targets;
 
-#ifdef LDAP_CACHING 
        struct rewrite_info     *rwinfo;
        cache_manager           *cm; 
        Backend                 *glue_be; 
-#endif /* LDAP_CACHING */
 
        struct metadncache      cache;
        
@@ -165,7 +184,6 @@ struct metainfo {
 #define META_OP_REQUIRE_ALL            0x02
 extern struct metaconn *
 meta_back_getconn(
-               struct metainfo         *li,
                Operation               *op,
                SlapReply               *rs,
                int                     op_type,