mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed Filter.f_dn to struct berval*

Browse Source
This commit is contained in:
Howard Chu 2001-12-26 23:37:59 +00:00
parent ef7a99ff99
commit e8fa25a215
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/slapd/back-bdb/search.c
View File

@ -560,7 +560,7 @@ static int search_candidates(
fand.f_choice = scope == LDAP_SCOPE_SUBTREE
? SLAPD_FILTER_DN_SUBTREE
: SLAPD_FILTER_DN_ONE;
fand.f_dn = e->e_ndn;
fand.f_dn = &e->e_nname;
fand.f_next = xf.f_or == filter ? filter : &xf ;

12
servers/slapd/back-ldbm/dn2id.c
View File

@ -208,7 +208,7 @@ dn2id(
int
dn2idl(
Backend *be,
const char *dn,
struct berval *dn,
int prefix,
ID_BLOCK **idlp
)
@ -218,15 +218,15 @@ dn2idl(
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"dn2idl: \"%c%s\"\n", prefix, dn ));
"dn2idl: \"%c%s\"\n", prefix, dn->bv_val ));
#else
Debug( LDAP_DEBUG_TRACE, "=> dn2idl( \"%c%s\" )\n", prefix, dn, 0 );
Debug( LDAP_DEBUG_TRACE, "=> dn2idl( \"%c%s\" )\n", prefix, dn->bv_val, 0 );
#endif
assert( idlp != NULL );
*idlp = NULL;
if ( prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn) ) {
if ( prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn->bv_val) ) {
*idlp = ch_malloc( sizeof(ID) );
**idlp = ID_BLOCK_ALLIDS_VALUE;
return 0;
@ -247,9 +247,9 @@ dn2idl(
ldbm_datum_init( key );
key.dsize = strlen( dn ) + 2;
key.dsize = dn->bv_len + 2;
key.dptr = ch_malloc( key.dsize );
sprintf( key.dptr, "%c%s", prefix, dn );
sprintf( key.dptr, "%c%s", prefix, dn->bv_val );
*idlp = idl_fetch( be, db, key );

2
servers/slapd/back-ldbm/proto-back-ldbm.h
View File

@ -80,7 +80,7 @@ void *ldbm_cache_sync_daemon LDAP_P(( void *));
int dn2id_add LDAP_P(( Backend *be, const char *dn, ID id ));
int dn2id LDAP_P(( Backend *be, const char *dn, ID *idp ));
int dn2idl LDAP_P(( Backend *be, const char *dn, int prefix, ID_BLOCK **idlp ));
int dn2idl LDAP_P(( Backend *be, struct berval *dn, int prefix, ID_BLOCK **idlp ));
int dn2id_delete LDAP_P(( Backend *be, const char *dn, ID id ));
Entry * dn2entry_rw LDAP_P(( Backend *be, const char *dn, Entry **matched, int rw ));

2
servers/slapd/back-ldbm/search.c
View File

@ -598,7 +598,7 @@ search_candidates(
fand.f_choice = scope == LDAP_SCOPE_SUBTREE
? SLAPD_FILTER_DN_SUBTREE
: SLAPD_FILTER_DN_ONE;
fand.f_dn = e->e_ndn;
fand.f_dn = &e->e_nname;
fand.f_next = xf.f_or == filter ? filter : &xf ;
candidates = filter_candidates( be, &f );

2
servers/slapd/slap.h
View File

@ -565,7 +565,7 @@ typedef struct slap_filter {
ber_int_t f_un_result;
/* DN */
char *f_un_dn;
struct berval *f_un_dn;
/* present */
AttributeDescription *f_un_desc;