backglue, sasl, and tool fixes

diff --git a/CHANGES b/CHANGES
index 2344fec1f683de8283acfc88f1b0aa07083514e4..1bd228a40c54207d5facc91bec8bc348a4b14947 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,21 +4,24 @@ OpenLDAP 2.1.9 Engineering
        Fixed back-bdb moddn newSuperior bug
        Fixed back-ldap/meta modify bug (ITS#2158)
        Fixed libldap try_read1msg drain bug (ITS#2153)
-       Fixed slapd unix socket unlink bug (ITS#2157)
-       Fixed slapd empty SASL cred bug
-       Fixed slapd referral/alias normalization bug
+       Fixed libldap SASL bugs (ITS#2184)
+       Fixed libldap referral bug (ITS#2187)
        Added slapd allow update_anon feature (ITS#2155)
        Added slapd authz stats logging feature (ITS#2165)
+       Fixed slapd unix socket unlink bug (ITS#2157)
+       Fixed slapd referral/alias normalization bug
        Fixed slapd logging bugs (ITS#2170)
        Fixed slapd rootdse entry_free bug (ITS#2172)
        Fixed slapd multimaster passwd bug (ITS#2176)
        Fixed slapd bad acl DN bug (ITS#2196)
+       Fixed slapd SASL bugs (ITS#2200) (ITS#2202)
        Removed lint
        Build Environment
                Add subordinate referral test
                Updated other misc other tests
                Updated back-sql checks (ITS#2163)
-               Fix configure shtool no bold handling
+               Fixed liblber snprintf issues (ITS#2128) (ITS#2129) (ITS#2203)
+               Fixed configure shtool no bold handling
 
 OpenLDAP 2.1.8 Release
        Build Environment

diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index 1056944ebd255be7170b73275a5ca7b9c41ac04c..78f2eec5a1dbd28199dd9ddc8d43bdd5a3d0ebfa 100644 (file)
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -123,7 +123,7 @@ ID bdb_tool_entry_put(
 
        assert( text );
        assert( text->bv_val );
-       assert( text->bv_val[0] == '\0' );
+       assert( text->bv_val[0] == '\0' );      /* overconservative? */
 
 #ifdef NEW_LOGGING
        LDAP_LOG ( TOOLS, ARGS, "=> bdb_tool_entry_put( %ld, \"%s\" )\n",

diff --git a/servers/slapd/back-ldbm/tools.c b/servers/slapd/back-ldbm/tools.c
index 5d0855bfe53ed749a95d6268b5d6b0854fa572e8..5f415384f19d5ec4781a3f8911f00a792ea7060d 100644 (file)
--- a/servers/slapd/back-ldbm/tools.c
+++ b/servers/slapd/back-ldbm/tools.c
@@ -179,7 +179,7 @@ ID ldbm_tool_entry_put(
 
        assert( text );
        assert( text->bv_val );
-       assert( text->bv_val[0] == '\0' );
+       assert( text->bv_val[0] == '\0' );      /* overconservative? */
 
        if ( next_id_get( be, &id ) || id == NOID ) {
                strncpy( text->bv_val, "unable to get nextid", text->bv_len );

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index b2665549b07810dccf4057f2985b9b8d419a6c56..eb58fbbaa03a3c819d50518b261690b96b201631 100644 (file)
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -40,7 +40,8 @@ typedef struct gluenode {
 } gluenode;
 
 typedef struct glueinfo {
-       BackendDB *be;
+       BackendInfo bi;
+       BackendDB bd;
        int nodes;
        gluenode n[1];
 } glueinfo;
@@ -55,7 +56,7 @@ glue_back_select (
        const char *dn
 )
 {
-       glueinfo *gi = (glueinfo *) be->be_private;
+       glueinfo *gi = (glueinfo *) be->bd_info;
        struct berval bv;
        int i;
 
@@ -114,7 +115,7 @@ glue_back_db_open (
        BackendDB *be
 )
 {
-       glueinfo *gi = (glueinfo *)be->be_private;
+       glueinfo *gi = (glueinfo *) be->bd_info;
        static int glueOpened = 0;
        int rc = 0;
 
@@ -122,10 +123,10 @@ glue_back_db_open (
 
        glueOpened = 1;
 
-       gi->be->be_acl = be->be_acl;
+       gi->bd.be_acl = be->be_acl;
 
-       if (gi->be->bd_info->bi_db_open)
-               rc = gi->be->bd_info->bi_db_open(gi->be);
+       if (gi->bd.bd_info->bi_db_open)
+               rc = gi->bd.bd_info->bi_db_open(&gi->bd);
 
        return rc;
 }
@@ -135,7 +136,7 @@ glue_back_db_close (
        BackendDB *be
 )
 {
-       glueinfo *gi = (glueinfo *)be->be_private;
+       glueinfo *gi = (glueinfo *) be->bd_info;
        static int glueClosed = 0;
 
        if (glueClosed) return 0;
@@ -143,8 +144,8 @@ glue_back_db_close (
        glueClosed = 1;
 
        /* Close the master */
-       if (gi->be->bd_info->bi_db_close)
-               gi->be->bd_info->bi_db_close( gi->be );
+       if (gi->bd.bd_info->bi_db_close)
+               gi->bd.bd_info->bi_db_close( &gi->bd );
 
        return 0;
 }
@@ -154,11 +155,10 @@ glue_back_db_destroy (
        BackendDB *be
 )
 {
-       glueinfo *gi = (glueinfo *)be->be_private;
+       glueinfo *gi = (glueinfo *) be->bd_info;
 
-       if (gi->be->bd_info->bi_db_destroy)
-               gi->be->bd_info->bi_db_destroy( gi->be );
-       free (gi->be);
+       if (gi->bd.bd_info->bi_db_destroy)
+               gi->bd.bd_info->bi_db_destroy( &gi->bd );
        free (gi);
        return 0;
 }
@@ -195,6 +195,7 @@ glue_back_response (
                gs->err = err;
        if (gs->err == LDAP_SUCCESS && gs->matched) {
                free (gs->matched);
+               gs->matched = NULL;
                gs->matchlen = 0;
        }
        if (gs->err != LDAP_SUCCESS && matched) {
@@ -290,7 +291,7 @@ glue_back_search (
        int attrsonly
 )
 {
-       glueinfo *gi = (glueinfo *)b0->be_private;
+       glueinfo *gi = (glueinfo *) b0->bd_info;
        BackendDB *be;
        int i, rc = 0, t2limit = 0, s2limit = 0;
        long stoptime = 0;
@@ -394,262 +395,6 @@ done:
        return rc;
 }
 
-static int
-glue_back_bind (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       struct berval *dn,
-       struct berval *ndn,
-       int method,
-       struct berval *cred,
-       struct berval *edn
-)
-{
-       BackendDB *be;
-       int rc;
- 
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_bind) {
-               rc = be->be_bind (be, conn, op, dn, ndn, method, cred, edn);
-
-               if( rc == LDAP_SUCCESS ) {
-                       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-                       if( conn->c_authz_backend == NULL ) {
-                               conn->c_authz_backend = be;
-                       }
-                       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
-               }
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-               send_ldap_result (conn, op, rc, NULL, "No bind target found",
-                                 NULL, NULL);
-       }
-       return rc;
-}
-
-static int
-glue_back_compare (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       struct berval *dn,
-       struct berval *ndn,
-       AttributeAssertion *ava
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_compare) {
-               rc = be->be_compare (be, conn, op, dn, ndn, ava);
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-               send_ldap_result (conn, op, rc, NULL, "No compare target found",
-                       NULL, NULL);
-       }
-       return rc;
-}
-
-static int
-glue_back_modify (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       struct berval *dn,
-       struct berval *ndn,
-       Modifications *mod
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_modify) {
-               rc = be->be_modify (be, conn, op, dn, ndn, mod);
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-               send_ldap_result (conn, op, rc, NULL,
-                       "No modify target found", NULL, NULL);
-       }
-       return rc;
-}
-
-static int
-glue_back_modrdn (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       struct berval *dn,
-       struct berval *ndn,
-       struct berval *newrdn,
-       struct berval *nnewrdn,
-       int del,
-       struct berval *newsup,
-       struct berval *nnewsup
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_modrdn) {
-               rc = be->be_modrdn (be, conn, op, dn, ndn,
-                       newrdn, nnewrdn, del, newsup, nnewsup );
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-               send_ldap_result (conn, op, rc, NULL,
-                       "No modrdn target found", NULL, NULL);
-       }
-       return rc;
-}
-
-static int
-glue_back_add (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       Entry *e
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, e->e_ndn);
-
-       if (be && be->be_add) {
-               rc = be->be_add (be, conn, op, e);
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-               send_ldap_result (conn, op, rc, NULL, "No add target found",
-                                 NULL, NULL);
-       }
-       return rc;
-}
-
-static int
-glue_back_delete (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       struct berval *dn,
-       struct berval *ndn
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_delete) {
-               rc = be->be_delete (be, conn, op, dn, ndn);
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-               send_ldap_result (conn, op, rc, NULL, "No delete target found",
-                                 NULL, NULL);
-       }
-       return rc;
-}
-
-static int
-glue_back_release_rw (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       Entry *e,
-       int rw
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, e->e_ndn);
-
-       if (be && be->be_release) {
-               rc = be->be_release (be, conn, op, e, rw);
-       } else {
-               entry_free (e);
-               rc = 0;
-       }
-       return rc;
-}
-
-static int
-glue_back_group (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       Entry *target,
-       struct berval *ndn,
-       struct berval *ondn,
-       ObjectClass *oc,
-       AttributeDescription * ad
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_group) {
-               rc = be->be_group (be, conn, op, target, ndn, ondn, oc, ad);
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-       }
-       return rc;
-}
-
-static int
-glue_back_attribute (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       Entry *target,
-       struct berval *ndn,
-       AttributeDescription *ad,
-       BerVarray *vals
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_attribute) {
-               rc = be->be_attribute (be, conn, op, target, ndn, ad, vals);
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-       }
-       return rc;
-}
-
-static int
-glue_back_referrals (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       struct berval *dn,
-       struct berval *ndn,
-       const char **text
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_chk_referrals) {
-               rc = be->be_chk_referrals (be, conn, op, dn, ndn, text);
-       } else {
-               rc = LDAP_SUCCESS;;
-       }
-       return rc;
-}
 
 static int
 glue_tool_entry_open (
@@ -687,7 +432,7 @@ glue_tool_entry_first (
        BackendDB *b0
 )
 {
-       glueinfo *gi = (glueinfo *) b0->be_private;
+       glueinfo *gi = (glueinfo *) b0->bd_info;
        int i;
 
        /* If we're starting from scratch, start at the most general */
@@ -712,7 +457,7 @@ glue_tool_entry_next (
        BackendDB *b0
 )
 {
-       glueinfo *gi = (glueinfo *) b0->be_private;
+       glueinfo *gi = (glueinfo *) b0->bd_info;
        int i;
        ID rc;
 
@@ -800,7 +545,7 @@ glue_tool_sync (
        BackendDB *b0
 )
 {
-       glueinfo *gi = (glueinfo *) b0->be_private;
+       glueinfo *gi = (glueinfo *) b0->bd_info;
        int i;
 
        /* just sync everyone */
@@ -854,30 +599,17 @@ glue_sub_init( )
                                 */
                                b1->be_flags |= SLAP_BFLAG_GLUE_INSTANCE;
                                gi = (glueinfo *)ch_malloc(sizeof(glueinfo));
-                               gi->be = (BackendDB *)ch_malloc(
-                                       sizeof(BackendDB) + sizeof(BackendInfo));
-                               bi = (BackendInfo *)(gi->be+1);
-                               *gi->be = *b1;
                                gi->nodes = 0;
-                               *bi = *b1->bd_info;
+                               gi->bd = *b1;
+                               gi->bi = *b1->bd_info;
+                               bi = (BackendInfo *)gi;
                                bi->bi_open = glue_back_open;
                                bi->bi_close = glue_back_close;
                                bi->bi_db_open = glue_back_db_open;
                                bi->bi_db_close = glue_back_db_close;
                                bi->bi_db_destroy = glue_back_db_destroy;
 
-                               bi->bi_op_bind = glue_back_bind;
                                bi->bi_op_search = glue_back_search;
-                               bi->bi_op_compare = glue_back_compare;
-                               bi->bi_op_modify = glue_back_modify;
-                               bi->bi_op_modrdn = glue_back_modrdn;
-                               bi->bi_op_add = glue_back_add;
-                               bi->bi_op_delete = glue_back_delete;
-
-                               bi->bi_entry_release_rw = glue_back_release_rw;
-                               bi->bi_acl_group = glue_back_group;
-                               bi->bi_acl_attribute = glue_back_attribute;
-                               bi->bi_chk_referrals = glue_back_referrals;
 
                                /*
                                 * hooks for slap tools
@@ -903,10 +635,9 @@ glue_sub_init( )
                        /* One more node for the master */
                        gi = (glueinfo *)ch_realloc(gi,
                                sizeof(glueinfo) + gi->nodes * sizeof(gluenode));
-                       gi->n[gi->nodes].be = gi->be;
+                       gi->n[gi->nodes].be = &gi->bd;
                        dnParent( &b1->be_nsuffix[0], &gi->n[gi->nodes].pdn );
                        gi->nodes++;
-                       b1->be_private = gi;
                        b1->bd_info = bi;
                }
        }

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index dec3c1f97268c1285a10873fe2d358c3311f53e3..876d7d99b5ed50d9537a287a38e6ad4dfa85431a 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -1515,8 +1515,7 @@ int slap_sasl_bind(
        if ( !conn->c_sasl_bind_in_progress ) {
                sc = START( ctx,
                        conn->c_sasl_bind_mech.bv_val,
-                       cred->bv_len ? cred->bv_val : "",
-                       cred->bv_len,
+                       cred->bv_val, cred->bv_len,
                        (SASL_CONST char **)&response.bv_val, &reslen, &errstr );
 
        } else {

diff --git a/servers/slapd/tools/slapadd.c b/servers/slapd/tools/slapadd.c
index 81f81f3f4168f3e2f0bbf3db8d71e5784271416e..1f31d57735385f4f5b0195d30c424622e6c173b9 100644 (file)
--- a/servers/slapd/tools/slapadd.c
+++ b/servers/slapd/tools/slapadd.c
@@ -59,8 +59,12 @@ main( int argc, char **argv )
                Entry *e = str2entry( buf );
                struct berval bvtext;
 
+               /*
+                * Initialize text buffer
+                */
                bvtext.bv_len = textlen;
                bvtext.bv_val = textbuf;
+               bvtext.bv_val[0] = '\0';
 
                if( e == NULL ) {
                        fprintf( stderr, "%s: could not parse entry (line=%d)\n",