Merge remote branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-sql/config.c b/servers/slapd/back-sql/config.c
index cf9740b219c7de6443559b43e49ba0a0e1e63a61..0895a68a2d3554365760e93989835338731405c7 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-2011 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
  * Portions Copyright 1999 Dmitry Kovalev.
  * Portions Copyright 2002 Pierangelo Masarati.
  * Portions Copyright 2004 Mark Adamson.
@@ -152,7 +152,7 @@ static ConfigTable sqlcfg[] = {
        { "delobjclasses_stmt", "SQL expression", 2, 2, 0, ARG_STRING|ARG_OFFSET,
                (void *)offsetof(struct backsql_info, sql_delobjclasses_stmt),
                "( OLcfgDbAt:6.33 NAME 'olcSqlDelObjclassesStmt' "
-                       "DESC 'Statement used to delete an entry's ID' "
+                       "DESC 'Statement used to delete the ID of an entry' "
                        "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
        { "has_ldapinfo_dn_ru", "yes|no", 2, 2, 0,
                ARG_ON_OFF|ARG_MAGIC|BSQL_HAS_LDAPINFO_DN_RU, (void *)sql_cf_gen,
@@ -228,7 +228,7 @@ static ConfigOCs sqlocs[] = {
                "olcSqlSubtreeCond $ olcsqlChildrenCond $ olcSqlDnMatchCond $ "
                "olcSqlOcQuery $ olcSqlAtQuery $ olcSqlInsEntryStmt $ "
                "olcSqlCreateNeedsSelect $ olcSqlUpperFunc $ olcSqlUpperNeedsCast $ "
-               "olcSqlStrCastFunc $ olcSqlDelEntryStmt $ olcSelRenEntryStmt $ "
+               "olcSqlStrCastFunc $ olcSqlDelEntryStmt $ olcSqlRenEntryStmt $ "
                "olcSqlDelObjClassesStmt $ olcSqlHasLDAPInfoDnRu $ "
                "olcSqlFailIfNoMapping $ olcSqlAllowOrphans $ olcSqlBaseObject $ "
                "olcSqlLayer $ olcSqlUseSubtreeShortcut $ olcSqlFetchAllAttrs $ "