|
 |
95f81a |
fix: id_query option is not available after rebasing openldap to 2.4.39
|
|
|
95f81a |
Resolves: rhbz#1311832
|
|
|
95f81a |
Upstream: ITS#8329
|
|
|
95f81a |
diff --git a/servers/slapd/back-sql/config.c b/servers/slapd/back-sql/config.c
|
|
|
95f81a |
--- a/servers/slapd/back-sql/config.c
|
|
|
95f81a |
+++ b/servers/slapd/back-sql/config.c
|
|
|
95f81a |
@@ -213,6 +213,11 @@ static ConfigTable sqlcfg[] = {
|
|
|
95f81a |
ARG_ON_OFF|ARG_MAGIC|SQL_AUTOCOMMIT, (void *)sql_cf_gen,
|
|
|
95f81a |
"( OLcfgDbAt:6.45 NAME 'olcSqlAutocommit' "
|
|
|
95f81a |
"SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },
|
|
|
95f81a |
+ { "id_query", "SQL expression", 2, 0, 0, ARG_STRING|ARG_QUOTE|ARG_OFFSET,
|
|
|
95f81a |
+ (void *)offsetof(struct backsql_info, sql_id_query),
|
|
|
95f81a |
+ "( OLcfgDbAt:6.46 NAME 'olcSqlIdQuery' "
|
|
|
95f81a |
+ "DESC 'Query used to collect entryID mapping data' "
|
|
|
95f81a |
+ "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
|
|
|
95f81a |
{ NULL, NULL, 0, 0, 0, ARG_IGNORED,
|
|
|
95f81a |
NULL, NULL, NULL, NULL }
|
|
|
95f81a |
};
|
|
|
95f81a |
@@ -233,7 +238,7 @@ static ConfigOCs sqlocs[] = {
|
|
|
95f81a |
"olcSqlFailIfNoMapping $ olcSqlAllowOrphans $ olcSqlBaseObject $ "
|
|
|
95f81a |
"olcSqlLayer $ olcSqlUseSubtreeShortcut $ olcSqlFetchAllAttrs $ "
|
|
|
95f81a |
"olcSqlFetchAttrs $ olcSqlCheckSchema $ olcSqlAliasingKeyword $ "
|
|
|
95f81a |
- "olcSqlAliasingQuote $ olcSqlAutocommit ) )",
|
|
|
95f81a |
+ "olcSqlAliasingQuote $ olcSqlAutocommit $ olcSqlIdQuery ) )",
|
|
|
95f81a |
Cft_Database, sqlcfg },
|
|
|
95f81a |
{ NULL, Cft_Abstract, NULL }
|
|
|
95f81a |
};
|