Quick struct berval DN support for defer alias API.

Underlying code needs work.

diff --git a/servers/slapd/back-bdb/proto-bdb.h b/servers/slapd/back-bdb/proto-bdb.h
index 5861142f89d34299b56cec75bee1b24481941e19..614af841160c6b19d60fc63b59c1f268f980eeca 100644 (file)
--- a/servers/slapd/back-bdb/proto-bdb.h
+++ b/servers/slapd/back-bdb/proto-bdb.h
@@ -15,7 +15,7 @@ LDAP_BEGIN_DECL
 Entry *bdb_deref_internal_r LDAP_P((
        BackendDB *be,
        Entry *e,
-       const char *dn,
+       struct berval *dn,
        int *err,
        Entry **matched,
        const char **text ));

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index 4fe8393a24eab562010ba97d217463832a5dd535..6456432f55641e2590570c6796dde6b1700a95af 100644 (file)
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -73,7 +73,7 @@ bdb_search(
 #ifdef BDB_ALIASES
        /* get entry with reader lock */
        if ( deref & LDAP_DEREF_FINDING ) {
-               e = deref_dn_r( be, nbase->bv_val, &err, &matched, &text );
+               e = deref_dn_r( be, nbase-, &err, &matched, &text );
 
        } else
 #endif

diff --git a/servers/slapd/back-ldbm/alias.c b/servers/slapd/back-ldbm/alias.c
index f04428ad14f58f56baa45dc7a94e4f8a665eb51d..e78fb6c53705088e5be6361618223a898fc93ef6 100644 (file)
--- a/servers/slapd/back-ldbm/alias.c
+++ b/servers/slapd/back-ldbm/alias.c
@@ -31,7 +31,7 @@ static int dnlist_subordinate(
 Entry *deref_internal_r(
        Backend*        be,
        Entry*          alias,
-       const char*             dn_in,
+       struct berval*  dn_in,
        int*            err,
        Entry**         matched,
        const char**            text )
@@ -51,7 +51,7 @@ Entry *deref_internal_r(
        *text = NULL;
 
        if( alias == NULL ) {
-               dn = ch_strdup( dn_in );
+               dn = ch_strdup( dn_in->bv_val );
                entry = dn2entry_r( be, dn, &sup );
 
        } else {

diff --git a/servers/slapd/back-ldbm/proto-back-ldbm.h b/servers/slapd/back-ldbm/proto-back-ldbm.h
index 703621932fa01e0a3dd287ef0b148539944fc6e5..4433f736cf2fff43f4af95596ed7f0344c838d13 100644 (file)
--- a/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -19,7 +19,7 @@ LDAP_BEGIN_DECL
 Entry *deref_internal_r LDAP_P((
        Backend *be,
        Entry *e,
-       const char *dn,
+       struct berval *dn,
        int *err,
        Entry **matched,
        const char **text ));

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 6ba0b67afa3a20444680677ef8b6c30bba41c4e1..f3ddf38c61afdc4703c43cf33be793a32f281cf6 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -79,7 +79,7 @@ ldbm_back_search(
                
        } else if ( deref & LDAP_DEREF_FINDING ) {
                /* deref dn and get entry with reader lock */
-               e = deref_dn_r( be, nbase->bv_val, &err, &matched, &text );
+               e = deref_dn_r( be, nbase, &err, &matched, &text );
 
                if( err == LDAP_NO_SUCH_OBJECT ) err = LDAP_REFERRAL;