ITS#5656

diff --git a/CHANGES b/CHANGES
index 845900c37c56fc033f53ef3ef3f2d780af607ba7..51d682ecef26852e751fdc0979f973402101efe9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log
 OpenLDAP 2.4.13 Engineering
        Fixed liblutil hex conversion (ITS#5699)
        Fixed slapd-bdb/hdb invalid db crash (ITS#5698)
+       Added slapo-translucent try local bind when remote fails (ITS#5656)
 
 OpenLDAP 2.4.12 Release (2008/10/12)
        Fixed libldap ldap_utf8_strchar arguments (ITS#5720)

diff --git a/doc/man/man5/slapo-translucent.5 b/doc/man/man5/slapo-translucent.5
index 10ab87b6354215352112fdf5980fd5fe6f48fa24..5f308b6bf764bdf4c170b0dc6f035ed684b38314 100644 (file)
--- a/doc/man/man5/slapo-translucent.5
+++ b/doc/man/man5/slapo-translucent.5
@@ -83,6 +83,11 @@ is specified, searches will only be run on the remote database. In any case, bot
 the local and remote entries corresponding to a search result will be merged
 before being returned to the client.
 
+.TP
+.B translucent_bind_local 
+Enable looking for locally stored credentials for simple bind when binding
+to the remote database fails.
+
 .SH CAVEATS
 .LP
 The Translucent Proxy overlay will disable schema checking in the local database,

diff --git a/servers/slapd/overlays/translucent.c b/servers/slapd/overlays/translucent.c
index 60dd7d02dd2b3c2b091c445b66231d61f132db38..5be6f743116b066627d7fdeab90406d98fc72d34 100644 (file)
--- a/servers/slapd/overlays/translucent.c
+++ b/servers/slapd/overlays/translucent.c
@@ -41,6 +41,7 @@ typedef struct translucent_info {
        int strict;
        int no_glue;
        int defer_db_open;
+       int bind_local;
 } translucent_info;
 
 static ConfigLDAPadd translucent_ldadd;
@@ -78,6 +79,12 @@ static ConfigTable translucentcfg[] = {
          "( OLcfgOvAt:14.4 NAME 'olcTranslucentRemote' "
          "DESC 'Attributes to use in remote search filter' "
          "SYNTAX OMsDirectoryString )", NULL, NULL },
+       { "translucent_bind_local", "on|off", 1, 2, 0,
+         ARG_ON_OFF|ARG_OFFSET,
+         (void *)offsetof(translucent_info, bind_local),
+         "( OLcfgOvAt:14.5 NAME 'olcTranslucentBindLocal' "
+         "DESC 'Enable local bind' "
+         "SYNTAX OMsBoolean SINGLE-VALUE)", NULL, NULL },
        { NULL, NULL, 0, 0, 0, ARG_IGNORED }
 };
 
@@ -95,7 +102,8 @@ static ConfigOCs translucentocs[] = {
          "DESC 'Translucent configuration' "
          "SUP olcOverlayConfig "
          "MAY ( olcTranslucentStrict $ olcTranslucentNoGlue $"
-         " olcTranslucentLocal $ olcTranslucentRemote ) )",
+         " olcTranslucentLocal $ olcTranslucentRemote $"
+         " olcTranslucentBindLocal ) )",
          Cft_Overlay, translucentcfg, NULL, translucent_cfadd },
        { "( OLcfgOvOc:14.2 "
          "NAME 'olcTranslucentDatabase' "
@@ -1044,6 +1052,7 @@ static int translucent_bind(Operation *op, SlapReply *rs) {
        slap_overinst *on = (slap_overinst *) op->o_bd->bd_info;
        translucent_info *ov = on->on_bi.bi_private;
        BackendDB *db;
+       slap_callback sc = { 0 }, *save_cb;
        int rc;
 
        Debug(LDAP_DEBUG_TRACE, "translucent_bind: <%s> method %d\n",
@@ -1054,10 +1063,25 @@ static int translucent_bind(Operation *op, SlapReply *rs) {
                        "remote DB not available");
                return(rs->sr_err);
        }
+
+       if (ov->bind_local) {
+               sc.sc_response = slap_null_cb;
+               save_cb = op->o_callback;
+               op->o_callback = &sc;
+       }
+
        db = op->o_bd;
        op->o_bd = &ov->db;
        rc = ov->db.bd_info->bi_op_bind(op, rs);
        op->o_bd = db;
+
+       if (ov->bind_local) {
+               op->o_callback = save_cb;
+               if (rc != LDAP_SUCCESS) {
+                       rc = SLAP_CB_CONTINUE;
+               }
+       }
+
        return rc;
 }