allow proxies to filter out search references (ITS#5593)

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

diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c
index 03acdaab7487130ee3c22500ace868bb6d0b789a..bf8a8ff253c83fdae44d909ff6245490e6ae2485 100644 (file)
--- a/servers/slapd/back-ldap/config.c
+++ b/servers/slapd/back-ldap/config.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2007 The OpenLDAP Foundation.
+ * Copyright 2003-2008 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -69,6 +69,9 @@ enum {
        LDAP_BACK_CFG_CONNPOOLMAX,
        LDAP_BACK_CFG_CANCEL,
        LDAP_BACK_CFG_QUARANTINE,
+       LDAP_BACK_CFG_ST_REQUEST,
+       LDAP_BACK_CFG_NOREFS,
+
        LDAP_BACK_CFG_REWRITE,
 
        LDAP_BACK_CFG_LAST
@@ -183,7 +186,7 @@ static ConfigTable ldapcfg[] = {
                        "SYNTAX OMsDirectoryString "
                        "X-ORDERED 'VALUES' )",
                NULL, NULL },
-       { "rebind-as-user", "NO|yes", 1, 2, 0,
+       { "rebind-as-user", "true|FALSE", 1, 2, 0,
                ARG_MAGIC|ARG_ON_OFF|LDAP_BACK_CFG_REBIND,
                ldap_back_cf_gen, "( OLcfgDbAt:3.10 "
                        "NAME 'olcDbRebindAsUser' "
@@ -191,7 +194,7 @@ static ConfigTable ldapcfg[] = {
                        "SYNTAX OMsBoolean "
                        "SINGLE-VALUE )",
                NULL, NULL },
-       { "chase-referrals", "YES|no", 2, 2, 0,
+       { "chase-referrals", "true|FALSE", 2, 2, 0,
                ARG_MAGIC|ARG_ON_OFF|LDAP_BACK_CFG_CHASE,
                ldap_back_cf_gen, "( OLcfgDbAt:3.11 "
                        "NAME 'olcDbChaseReferrals' "
@@ -199,7 +202,7 @@ static ConfigTable ldapcfg[] = {
                        "SYNTAX OMsBoolean "
                        "SINGLE-VALUE )",
                NULL, NULL },
-       { "t-f-support", "NO|yes|discover", 2, 2, 0,
+       { "t-f-support", "true|FALSE|discover", 2, 2, 0,
                ARG_MAGIC|LDAP_BACK_CFG_T_F,
                ldap_back_cf_gen, "( OLcfgDbAt:3.12 "
                        "NAME 'olcDbTFSupport' "
@@ -207,7 +210,7 @@ static ConfigTable ldapcfg[] = {
                        "SYNTAX OMsDirectoryString "
                        "SINGLE-VALUE )",
                NULL, NULL },
-       { "proxy-whoami", "NO|yes", 1, 2, 0,
+       { "proxy-whoami", "true|FALSE", 1, 2, 0,
                ARG_MAGIC|ARG_ON_OFF|LDAP_BACK_CFG_WHOAMI,
                ldap_back_cf_gen, "( OLcfgDbAt:3.13 "
                        "NAME 'olcDbProxyWhoAmI' "
@@ -223,7 +226,7 @@ static ConfigTable ldapcfg[] = {
                        "SYNTAX OMsDirectoryString "
                        "SINGLE-VALUE )",
                NULL, NULL },
-       { "idle-timeout", "timeout", 2, 0, 0,
+       { "idle-timeout", "timeout", 2, 2, 0,
                ARG_MAGIC|LDAP_BACK_CFG_IDLE_TIMEOUT,
                ldap_back_cf_gen, "( OLcfgDbAt:3.15 "
                        "NAME 'olcDbIdleTimeout' "
@@ -231,7 +234,7 @@ static ConfigTable ldapcfg[] = {
                        "SYNTAX OMsDirectoryString "
                        "SINGLE-VALUE )",
                NULL, NULL },
-       { "conn-ttl", "ttl", 2, 0, 0,
+       { "conn-ttl", "ttl", 2, 2, 0,
                ARG_MAGIC|LDAP_BACK_CFG_CONN_TTL,
                ldap_back_cf_gen, "( OLcfgDbAt:3.16 "
                        "NAME 'olcDbConnTtl' "
@@ -239,7 +242,7 @@ static ConfigTable ldapcfg[] = {
                        "SYNTAX OMsDirectoryString "
                        "SINGLE-VALUE )",
                NULL, NULL },
-       { "network-timeout", "timeout", 2, 0, 0,
+       { "network-timeout", "timeout", 2, 2, 0,
                ARG_MAGIC|LDAP_BACK_CFG_NETWORK_TIMEOUT,
                ldap_back_cf_gen, "( OLcfgDbAt:3.17 "
                        "NAME 'olcDbNetworkTimeout' "
@@ -247,7 +250,7 @@ static ConfigTable ldapcfg[] = {
                        "SYNTAX OMsDirectoryString "
                        "SINGLE-VALUE )",
                NULL, NULL },
-       { "protocol-version", "version", 2, 0, 0,
+       { "protocol-version", "version", 2, 2, 0,
                ARG_MAGIC|ARG_INT|LDAP_BACK_CFG_VERSION,
                ldap_back_cf_gen, "( OLcfgDbAt:3.18 "
                        "NAME 'olcDbProtocolVersion' "
@@ -255,7 +258,7 @@ static ConfigTable ldapcfg[] = {
                        "SYNTAX OMsInteger "
                        "SINGLE-VALUE )",
                NULL, NULL },
-       { "single-conn", "TRUE/FALSE", 2, 0, 0,
+       { "single-conn", "true|FALSE", 2, 2, 0,
                ARG_MAGIC|ARG_ON_OFF|LDAP_BACK_CFG_SINGLECONN,
                ldap_back_cf_gen, "( OLcfgDbAt:3.19 "
                        "NAME 'olcDbSingleConn' "
@@ -263,7 +266,7 @@ static ConfigTable ldapcfg[] = {
                        "SYNTAX OMsBoolean "
                        "SINGLE-VALUE )",
                NULL, NULL },
-       { "cancel", "ABANDON|ignore|exop", 2, 0, 0,
+       { "cancel", "ABANDON|ignore|exop", 2, 2, 0,
                ARG_MAGIC|LDAP_BACK_CFG_CANCEL,
                ldap_back_cf_gen, "( OLcfgDbAt:3.20 "
                        "NAME 'olcDbCancel' "
@@ -271,7 +274,7 @@ static ConfigTable ldapcfg[] = {
                        "SYNTAX OMsDirectoryString "
                        "SINGLE-VALUE )",
                NULL, NULL },
-       { "quarantine", "retrylist", 2, 0, 0,
+       { "quarantine", "retrylist", 2, 2, 0,
                ARG_MAGIC|LDAP_BACK_CFG_QUARANTINE,
                ldap_back_cf_gen, "( OLcfgDbAt:3.21 "
                        "NAME 'olcDbQuarantine' "
@@ -279,7 +282,7 @@ static ConfigTable ldapcfg[] = {
                        "SYNTAX OMsDirectoryString "
                        "SINGLE-VALUE )",
                NULL, NULL },
-       { "use-temporary-conn", "TRUE/FALSE", 2, 0, 0,
+       { "use-temporary-conn", "true|FALSE", 2, 2, 0,
                ARG_MAGIC|ARG_ON_OFF|LDAP_BACK_CFG_USETEMP,
                ldap_back_cf_gen, "( OLcfgDbAt:3.22 "
                        "NAME 'olcDbUseTemporaryConn' "
@@ -287,7 +290,7 @@ static ConfigTable ldapcfg[] = {
                        "SYNTAX OMsBoolean "
                        "SINGLE-VALUE )",
                NULL, NULL },
-       { "conn-pool-max", "<n>", 2, 0, 0,
+       { "conn-pool-max", "<n>", 2, 2, 0,
                ARG_MAGIC|ARG_INT|LDAP_BACK_CFG_CONNPOOLMAX,
                ldap_back_cf_gen, "( OLcfgDbAt:3.23 "
                        "NAME 'olcDbConnectionPoolMax' "
@@ -295,6 +298,24 @@ static ConfigTable ldapcfg[] = {
                        "SYNTAX OMsInteger "
                        "SINGLE-VALUE )",
                NULL, NULL },
+#ifdef SLAP_CONTROL_X_SESSION_TRACKING
+       { "session-tracking-request", "true|FALSE", 2, 2, 0,
+               ARG_MAGIC|ARG_ON_OFF|LDAP_BACK_CFG_ST_REQUEST,
+               ldap_back_cf_gen, "( OLcfgDbAt:3.24 "
+                       "NAME 'olcDbSessionTrackingRequest' "
+                       "DESC 'Add session tracking control to proxied requests' "
+                       "SYNTAX OMsBoolean "
+                       "SINGLE-VALUE )",
+               NULL, NULL },
+#endif /* SLAP_CONTROL_X_SESSION_TRACKING */
+       { "norefs", "true|FALSE", 2, 2, 0,
+               ARG_MAGIC|ARG_ON_OFF|LDAP_BACK_CFG_NOREFS,
+               ldap_back_cf_gen, "( OLcfgDbAt:3.25 "
+                       "NAME 'olcDbNorefs' "
+                       "DESC 'Do not return search reference responses' "
+                       "SYNTAX OMsBoolean "
+                       "SINGLE-VALUE )",
+               NULL, NULL },
        { "suffixmassage", "[virtual]> <real", 2, 3, 0,
                ARG_STRING|ARG_MAGIC|LDAP_BACK_CFG_REWRITE,
                ldap_back_cf_gen, NULL, NULL, NULL },
@@ -334,6 +355,10 @@ static ConfigOCs ldapocs[] = {
                        "$ olcDbQuarantine "
                        "$ olcDbUseTemporaryConn "
                        "$ olcDbConnectionPoolMax "
+#ifdef SLAP_CONTROL_X_SESSION_TRACKING
+                       "$ olcDbSessionTrackingRequest "
+#endif /* SLAP_CONTROL_X_SESSION_TRACKING */
+                       "$ olcDbNorefs "
                ") )",
                        Cft_Database, ldapcfg},
        { NULL, 0, NULL }
@@ -1117,6 +1142,16 @@ ldap_back_cf_gen( ConfigArgs *c )
                        }
                        break;
 
+#ifdef SLAP_CONTROL_X_SESSION_TRACKING
+               case LDAP_BACK_CFG_ST_REQUEST:
+                       c->value_int = LDAP_BACK_ST_REQUEST( li );
+                       break;
+#endif /* SLAP_CONTROL_X_SESSION_TRACKING */
+
+               case LDAP_BACK_CFG_NOREFS:
+                       c->value_int = LDAP_BACK_NOREFS( li );
+                       break;
+
                default:
                        /* FIXME: we need to handle all... */
                        assert( 0 );
@@ -1233,6 +1268,16 @@ ldap_back_cf_gen( ConfigArgs *c )
                        li->li_flags &= ~LDAP_BACK_F_QUARANTINE;
                        break;
 
+#ifdef SLAP_CONTROL_X_SESSION_TRACKING
+               case LDAP_BACK_CFG_ST_REQUEST:
+                       li->li_flags &= ~LDAP_BACK_F_ST_REQUEST;
+                       break;
+#endif /* SLAP_CONTROL_X_SESSION_TRACKING */
+
+               case LDAP_BACK_CFG_NOREFS:
+                       li->li_flags &= ~LDAP_BACK_F_NOREFS;
+                       break;
+
                default:
                        /* FIXME: we need to handle all... */
                        assert( 0 );
@@ -1866,6 +1911,26 @@ done_url:;
                }
                break;
 
+#ifdef SLAP_CONTROL_X_SESSION_TRACKING
+       case LDAP_BACK_CFG_ST_REQUEST:
+               if ( c->value_int ) {
+                       li->li_flags |= LDAP_BACK_F_ST_REQUEST;
+
+               } else {
+                       li->li_flags &= ~LDAP_BACK_F_ST_REQUEST;
+               }
+               break;
+#endif /* SLAP_CONTROL_X_SESSION_TRACKING */
+
+       case LDAP_BACK_CFG_NOREFS:
+               if ( c->value_int ) {
+                       li->li_flags |= LDAP_BACK_F_NOREFS;
+
+               } else {
+                       li->li_flags &= ~LDAP_BACK_F_NOREFS;
+               }
+               break;
+
        case LDAP_BACK_CFG_REWRITE:
                snprintf( c->cr_msg, sizeof( c->cr_msg ),
                        "rewrite/remap capabilities have been moved "