Merge remote-tracking branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-sql/back-sql.h b/servers/slapd/back-sql/back-sql.h
index 936bd7703ac612011f6a82846d81110889493ace..e1d0db4a86431f696c8c6daa404ddefa3722441b 100644 (file)
--- a/servers/slapd/back-sql/back-sql.h
+++ b/servers/slapd/back-sql/back-sql.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2011 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
  * Portions Copyright 1999 Dmitry Kovalev.
  * Portions Copyright 2002 Pierangelo Mararati.
  * Portions Copyright 2004 Mark Adamson.
@@ -280,6 +280,8 @@ typedef struct backsql_api {
 
        void                    *ba_private;
        struct backsql_api      *ba_next;
+       char **ba_argv;
+       int     ba_argc;
 } backsql_api;
 
 /*
@@ -510,8 +512,9 @@ typedef struct backsql_info {
        struct berval   sql_upper_func;
        struct berval   sql_upper_func_open;
        struct berval   sql_upper_func_close;
-       BerVarray       sql_concat_func;
        struct berval   sql_strcast_func;
+       BerVarray       sql_concat_func;
+       char            *sql_concat_patt;
 
        struct berval   sql_aliasing;
        struct berval   sql_aliasing_quote;
@@ -570,6 +573,7 @@ typedef struct backsql_info {
        BACKSQL_ISF(si, BSQLF_AUTOCOMMIT_ON)
 
        Entry           *sql_baseObject;
+       char            *sql_base_ob_file;
 #ifdef BACKSQL_ARBITRARY_KEY
 #define BACKSQL_BASEOBJECT_IDSTR       "baseObject"
 #define BACKSQL_BASEOBJECT_KEYVAL      BACKSQL_BASEOBJECT_IDSTR