Happy New Year

[openldap] / servers / slapd / back-sql / config.c

diff --git a/servers/slapd/back-sql/config.c b/servers/slapd/back-sql/config.c
index e85e2188c100b50089b041bb55ed10769e29df8a..7607adca584449cb2f9f71c59abf8221f8468ccd 100644 (file)
--- a/servers/slapd/back-sql/config.c
+++ b/servers/slapd/back-sql/config.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2015 The OpenLDAP Foundation.
+ * Copyright 1999-2018 The OpenLDAP Foundation.
  * Portions Copyright 1999 Dmitry Kovalev.
  * Portions Copyright 2002 Pierangelo Masarati.
  * Portions Copyright 2004 Mark Adamson.
@@ -210,9 +210,14 @@ static ConfigTable sqlcfg[] = {
                        "DESC 'Quoting char of the aliasing keyword' "
                        "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
        { "autocommit", "yes|no", 2, 2, 0,
-               ARG_ON_OFF|ARG_MAGIC|SQL_AUTOCOMMIT, (void *)sql_cf_gen,
+               ARG_ON_OFF|ARG_MAGIC|BSQL_AUTOCOMMIT, (void *)sql_cf_gen,
                "( OLcfgDbAt:6.45 NAME 'olcSqlAutocommit' "
                        "SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },
+       { "id_query", "SQL expression", 2, 0, 0, ARG_STRING|ARG_QUOTE|ARG_OFFSET,
+               (void *)offsetof(struct backsql_info, sql_id_query),
+               "( OLcfgDbAt:6.46 NAME 'olcSqlIdQuery' "
+                       "DESC 'Query used to collect entryID mapping data' "
+                       "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
        { NULL, NULL, 0, 0, 0, ARG_IGNORED,
                NULL, NULL, NULL, NULL }
 };
@@ -233,7 +238,7 @@ static ConfigOCs sqlocs[] = {
                "olcSqlFailIfNoMapping $ olcSqlAllowOrphans $ olcSqlBaseObject $ "
                "olcSqlLayer $ olcSqlUseSubtreeShortcut $ olcSqlFetchAllAttrs $ "
                "olcSqlFetchAttrs $ olcSqlCheckSchema $ olcSqlAliasingKeyword $ "
-               "olcSqlAliasingQuote $ olcSqlAutocommit ) )",
+               "olcSqlAliasingQuote $ olcSqlAutocommit $ olcSqlIdQuery ) )",
                        Cft_Database, sqlcfg },
        { NULL, Cft_Abstract, NULL }
 };